summaryrefslogtreecommitdiffstats
path: root/daemons/ipa-sam
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2016-10-31 12:33:43 +0100
committerMartin Babinsky <mbabinsk@redhat.com>2016-11-09 13:08:32 +0100
commit24feae47f26f40f757fbdd711399128d88c9b62c (patch)
tree47bb9e1336f0b7cb6b4f15b18e80868192fd57b7 /daemons/ipa-sam
parent820fd4c7ce6ccc80272f45d6f64227567692dd39 (diff)
downloadfreeipa-24feae47f26f40f757fbdd711399128d88c9b62c.tar.gz
freeipa-24feae47f26f40f757fbdd711399128d88c9b62c.tar.xz
freeipa-24feae47f26f40f757fbdd711399128d88c9b62c.zip
Build: fix Makefile.am files to separate source and build directories
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>
Diffstat (limited to 'daemons/ipa-sam')
-rw-r--r--daemons/ipa-sam/Makefile.am12
1 files changed, 4 insertions, 8 deletions
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 = \