diff options
23 files changed, 38 insertions, 66 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index 03e92b2d6..0244259dd 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = asn1c -AM_CPPFLAGS = -I../util -Iasn1c +AM_CPPFLAGS = -I$(top_srcdir)/util -I$(srcdir)/asn1c noinst_LTLIBRARIES=libipaasn1.la noinst_HEADERS=ipa_asn1.h diff --git a/asn1/asn1c/Makefile.am b/asn1/asn1c/Makefile.am index b4dee675a..fa35562f1 100644 --- a/asn1/asn1c/Makefile.am +++ b/asn1/asn1c/Makefile.am @@ -33,7 +33,7 @@ libasn1c_la_SOURCES = \ TypeValuePair.c -AM_CPPFLAGS = -I../../util +AM_CPPFLAGS = -I$(top_srcdir)/util noinst_LTLIBRARIES=libasn1c.la diff --git a/client/Makefile.am b/client/Makefile.am index 30adafd38..0a146f082 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -12,15 +12,12 @@ if HAVE_GCC endif export AM_CFLAGS -KRB5_UTIL_DIR=../util -ASN1_UTIL_DIR=../asn1 IPA_CONF_FILE=$(sysconfdir)/ipa/default.conf AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ - -I$(KRB5_UTIL_DIR) \ - -I$(ASN1_UTIL_DIR) \ + -I$(top_srcdir)/util \ + -I$(top_srcdir)/asn1 \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -55,8 +52,8 @@ ipa_getkeytab_SOURCES = \ $(NULL) ipa_getkeytab_LDADD = \ - ../asn1/libipaasn1.la \ - $(KRB5_UTIL_DIR)/libutil.la \ + $(top_builddir)/asn1/libipaasn1.la \ + $(top_builddir)/util/libutil.la \ $(KRB5_LIBS) \ $(LDAP_LIBS) \ $(SASL_LIBS) \ diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 6e4f1cd2e..e8704e438 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -2,14 +2,10 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects NULL = -KRB5_UTIL_DIR = ../../util -IPA_UTIL_DIR = ../../../util AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ - -I$(KRB5_UTIL_DIR) \ - -I$(IPA_UTIL_DIR) \ + -I$(top_srcdir)/util \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -52,7 +48,7 @@ ipadb_la_LIBADD = \ $(NDRPAC_LIBS) \ $(UNISTRING_LIBS) \ $(NSS_LIBS) \ - $(KRB5_UTIL_DIR)/libutil.la \ + $(top_builddir)/util/libutil.la \ $(NULL) if HAVE_CMOCKA @@ -80,7 +76,7 @@ ipa_kdb_tests_LDADD = \ $(NDRPAC_LIBS) \ $(UNISTRING_LIBS) \ $(NSS_LIBS) \ - $(KRB5_UTIL_DIR)/libutil.la \ + $(top_builddir)/util/libutil.la \ -lkdb5 \ -lsss_idmap \ $(NULL) diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am index 16213f177..790e175c8 100644 --- a/daemons/ipa-sam/Makefile.am +++ b/daemons/ipa-sam/Makefile.am @@ -6,13 +6,9 @@ SAMBA40EXTRA_LIBS = $(SAMBA40EXTRA_LIBPATH) \ -lsmbconf \ $(NULL) -KRB5_UTIL_DIR=../../util -ASN1_UTIL_DIR=../../asn1 - AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ - -I$(ASN1_UTIL_DIR) \ + -I$(top_srcdir)/asn1 \ -I/usr/include/samba-4.0 \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ @@ -21,7 +17,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLDAPIDIR=\""$(localstatedir)/run"\" \ -DHAVE_LDAP \ - -I$(KRB5_UTIL_DIR) \ + -I$(top_srcdir)/util \ $(CRYPTO_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ @@ -56,8 +52,8 @@ ipasam_la_LIBADD = \ $(NDR_LIBS) \ $(SAMBA40EXTRA_LIBS) \ $(SSSIDMAP_LIBS) \ - $(ASN1_UTIL_DIR)/libipaasn1.la \ - $(KRB5_UTIL_DIR)/libutil.la \ + $(top_builddir)/asn1/libipaasn1.la \ + $(top_builddir)/util/libutil.la \ $(NULL) EXTRA_DIST = \ diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am index fba5b08bf..453f5ee89 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -DPREFIX=\""$(prefix)"\" \ diff --git a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am index 31b7485e3..f8f28d6f7 100644 --- a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am index 3ce37ac10..34b5cb780 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -DPREFIX=\""$(prefix)"\" \ diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am index 2579fc18b..3caad5325 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -DPREFIX=\""$(prefix)"\" \ diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am index 6e4c31aa5..89b509382 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am index a3f8d4f7b..51feb5b6d 100644 --- a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am index a5ee14527..1a9cbd95d 100644 --- a/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am @@ -1,7 +1,6 @@ MAINTAINERCLEANFILES = *~ Makefile.in -PLUGIN_COMMON_DIR = ../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ @@ -17,5 +16,5 @@ AM_CPPFLAGS = \ plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = libipa_otp_counter.la libipa_otp_counter_la_SOURCES = berval.c berval.h ldapmod.c ldapmod.h ipa_otp_counter.c -libipa_otp_counter_la_LDFLAGS = -avoid-version -export-symbols ipa-otp-counter.sym +libipa_otp_counter_la_LDFLAGS = -avoid-version -export-symbols $(srcdir)/ipa-otp-counter.sym libipa_otp_counter_la_LIBADD = $(LDAP_LIBS) diff --git a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am index cb6340960..75b243406 100644 --- a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am @@ -1,7 +1,6 @@ MAINTAINERCLEANFILES = *~ Makefile.in -PLUGIN_COMMON_DIR = ../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ @@ -17,7 +16,7 @@ AM_CPPFLAGS = \ plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = libipa_otp_lasttoken.la libipa_otp_lasttoken_la_SOURCES = ipa_otp_lasttoken.c -libipa_otp_lasttoken_la_LDFLAGS = -avoid-version -export-symbols ipa-otp-lasttoken.sym +libipa_otp_lasttoken_la_LDFLAGS = -avoid-version -export-symbols $(srcdir)/ipa-otp-lasttoken.sym libipa_otp_lasttoken_la_LIBADD = \ $(LDAP_LIBS) \ $(builddir)/../libotp/libotp.la diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index 7082c9216..a9bfd0c4a 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -1,16 +1,13 @@ NULL = MAINTAINERCLEANFILES = *~ Makefile.in -PLUGIN_COMMON_DIR = ../common -KRB5_UTIL_DIR = ../../../util -ASN1_UTIL_DIR=../../../asn1 +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I$(KRB5_UTIL_DIR) \ - -I$(ASN1_UTIL_DIR) \ + -I$(top_srcdir)/util \ + -I$(top_srcdir)/asn1 \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -37,8 +34,8 @@ plugindir = $(libdir)/dirsrv/plugins plugin_LTLIBRARIES = libipa_pwd_extop.la libipa_pwd_extop_la_LIBADD = \ $(builddir)/../libotp/libotp.la \ - $(ASN1_UTIL_DIR)/libipaasn1.la \ - $(KRB5_UTIL_DIR)/libutil.la \ + $(top_builddir)/asn1/libipaasn1.la \ + $(top_builddir)/util/libutil.la \ $(NULL) libipa_pwd_extop_la_SOURCES = \ common.c \ diff --git a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am index 5aa9b5485..bf7b1f2b5 100644 --- a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am index 642fdd599..2ff556119 100644 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am index 061d84833..ac86dd472 100644 --- a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am index afce915a0..686c95877 100644 --- a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am @@ -1,11 +1,10 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ - -I../../ \ -I$(srcdir) \ + -I$(top_builddir)/daemons/ \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ -DPREFIX=\""$(prefix)"\" \ diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am index 3108f3c15..aca4b9c26 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -DPREFIX=\""$(prefix)"\" \ diff --git a/daemons/ipa-slapi-plugins/libotp/Makefile.am b/daemons/ipa-slapi-plugins/libotp/Makefile.am index 71b9c19f4..35e8d2acb 100644 --- a/daemons/ipa-slapi-plugins/libotp/Makefile.am +++ b/daemons/ipa-slapi-plugins/libotp/Makefile.am @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = *~ Makefile.in -PLUGIN_COMMON_DIR = ../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = -I/usr/include/dirsrv \ -I$(PLUGIN_COMMON_DIR) diff --git a/daemons/ipa-slapi-plugins/topology/Makefile.am b/daemons/ipa-slapi-plugins/topology/Makefile.am index 8f3fa3b00..de4bd443c 100644 --- a/daemons/ipa-slapi-plugins/topology/Makefile.am +++ b/daemons/ipa-slapi-plugins/topology/Makefile.am @@ -1,9 +1,8 @@ NULL = -PLUGIN_COMMON_DIR=../common +PLUGIN_COMMON_DIR = $(srcdir)/../common AM_CPPFLAGS = \ - -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ -I/usr/include/dirsrv \ diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am index 0543872e6..932023ac5 100644 --- a/install/ui/build/freeipa/Makefile.am +++ b/install/ui/build/freeipa/Makefile.am @@ -20,6 +20,6 @@ widgets := $(wildcard ../../src/freeipa/widgets/*.js) nav := $(wildcard ../../src/freeipa/navigation/*.js) app.js: $(core) $(base) $(widgets) $(nav) - ../../util/make-ui.sh + $(srcdir)/../../util/make-ui.sh core.js: app.js diff --git a/install/ui/css/Makefile.am b/install/ui/css/Makefile.am index 9e66c7d58..64cb3fc89 100644 --- a/install/ui/css/Makefile.am +++ b/install/ui/css/Makefile.am @@ -18,4 +18,4 @@ MAINTAINERCLEANFILES = \ ipa := $(wildcard ../less/*.less) ipa.css: $(ipa) - ../util/make-css.sh
\ No newline at end of file + $(srcdir)/../util/make-css.sh |