IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-09-03 20:52:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Build: fix Makefile.am files to separate source and build directories

Browse Source 
This is step forward working VPATH builds which cleanly separate sources
and build artifacts. It makes the system cleaner and easier to
understand.

Python and web UI likely require more work to make VPATH builds working.

https://fedorahosted.org/freeipa/ticket/6418

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Petr Spacek
2016-11-09 13:08:32 +01:00
committed by Martin Babinsky
parent 820fd4c7ce
commit 24feae47f2
23 changed files with 38 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asn1/Makefile.am
+1 -1
View File
@@ -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
asn1/asn1c/Makefile.am
+1 -1
View File
@@ -33,7 +33,7 @@ libasn1c_la_SOURCES = \
TypeValuePair.c
AM_CPPFLAGS = -I../../util
AM_CPPFLAGS = -I$(top_srcdir)/util
noinst_LTLIBRARIES=libasn1c.la
client/Makefile.am
+4 -7
View File
@@ -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) \
daemons/ipa-kdb/Makefile.am
+3 -7
View File
@@ -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)
daemons/ipa-sam/Makefile.am
+4 -8
View File
@@ -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 = \
daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am
+1 -2
View File
@@ -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)"\" \
daemons/ipa-slapi-plugins/ipa-dns/Makefile.am
+1 -2
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am
+1 -2
View File
@@ -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)"\" \
daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am
+1 -2
View File
@@ -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)"\" \
daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am
+1 -2
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am
+1 -2
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-otp-counter/Makefile.am
+2 -3
View File
@@ -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)
daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am
+2 -3
View File
@@ -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
daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
+5 -8
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am
+1 -2
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am
+1 -2
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am
+1 -2
View File
@@ -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 \
daemons/ipa-slapi-plugins/ipa-version/Makefile.am
+2 -3
View File
@@ -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)"\" \
daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am
+1 -2
View File
@@ -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)"\" \
daemons/ipa-slapi-plugins/libotp/Makefile.am
+1 -1
View File
@@ -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)
daemons/ipa-slapi-plugins/topology/Makefile.am
+1 -2
View File
@@ -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 \
install/ui/build/freeipa/Makefile.am
+1 -1
View File
@@ -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
install/ui/css/Makefile.am
+1 -1
View File
@@ -18,4 +18,4 @@ MAINTAINERCLEANFILES = \
ipa := $(wildcard ../less/*.less)
ipa.css: $(ipa)
../util/make-css.sh
$(srcdir)/../util/make-css.sh