diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-10-11 15:41:46 +0200 |
|---|---|---|
| committer | David Kupka <dkupka@redhat.com> | 2016-10-24 13:30:12 +0200 |
| commit | b0cb6afa2308b9d96456f0355771ecbef0ca7263 (patch) | |
| tree | 5b9266a7e3c44ec83dc62ec71d64e0a91e2c284d /daemons | |
| parent | 25dab77301f9e0289b94b0a672aed5067384c8ce (diff) | |
| download | freeipa-b0cb6afa2308b9d96456f0355771ecbef0ca7263.tar.gz freeipa-b0cb6afa2308b9d96456f0355771ecbef0ca7263.tar.xz freeipa-b0cb6afa2308b9d96456f0355771ecbef0ca7263.zip | |
Build: transform util directory to libutil convenience library
This is autoconf way of doing things. It should allow us to enable
subdir-objects automake option and stay compatible with future versions
of automake.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/ipa-kdb/Makefile.am | 8 | ||||
| -rw-r--r-- | daemons/ipa-sam/Makefile.am | 4 | ||||
| -rw-r--r-- | daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 3 | ||||
| -rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 4 |
4 files changed, 8 insertions, 11 deletions
diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index a4ea366b0..6e4f1cd2e 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -1,9 +1,9 @@ +AUTOMAKE_OPTIONS = 1.7 subdir-objects + NULL = KRB5_UTIL_DIR = ../../util IPA_UTIL_DIR = ../../../util -KRB5_UTIL_SRCS = $(KRB5_UTIL_DIR)/ipa_krb5.c \ - $(KRB5_UTIL_DIR)/ipa_pwd.c AM_CPPFLAGS = \ -I. \ @@ -39,7 +39,6 @@ ipadb_la_SOURCES = \ ipa_kdb_mspac.c \ ipa_kdb_delegation.c \ ipa_kdb_audit_as.c \ - $(KRB5_UTIL_SRCS) \ $(NULL) ipadb_la_LDFLAGS = \ @@ -53,6 +52,7 @@ ipadb_la_LIBADD = \ $(NDRPAC_LIBS) \ $(UNISTRING_LIBS) \ $(NSS_LIBS) \ + $(KRB5_UTIL_DIR)/libutil.la \ $(NULL) if HAVE_CMOCKA @@ -71,7 +71,6 @@ ipa_kdb_tests_SOURCES = \ ipa_kdb_mspac.c \ ipa_kdb_delegation.c \ ipa_kdb_audit_as.c \ - $(KRB5_UTIL_SRCS) \ $(NULL) ipa_kdb_tests_CFLAGS = $(CMOCKA_CFLAGS) ipa_kdb_tests_LDADD = \ @@ -81,6 +80,7 @@ ipa_kdb_tests_LDADD = \ $(NDRPAC_LIBS) \ $(UNISTRING_LIBS) \ $(NSS_LIBS) \ + $(KRB5_UTIL_DIR)/libutil.la \ -lkdb5 \ -lsss_idmap \ $(NULL) diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am index c32149341..16213f177 100644 --- a/daemons/ipa-sam/Makefile.am +++ b/daemons/ipa-sam/Makefile.am @@ -7,7 +7,6 @@ SAMBA40EXTRA_LIBS = $(SAMBA40EXTRA_LIBPATH) \ $(NULL) KRB5_UTIL_DIR=../../util -KRB5_UTIL_SRCS=$(KRB5_UTIL_DIR)/ipa_krb5.c $(KRB5_UTIL_DIR)/ipa_pwd_ntlm.c ASN1_UTIL_DIR=../../asn1 AM_CPPFLAGS = \ @@ -22,7 +21,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLDAPIDIR=\""$(localstatedir)/run"\" \ -DHAVE_LDAP \ - -I $(KRB5_UTIL_DIR) \ + -I$(KRB5_UTIL_DIR) \ $(CRYPTO_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ @@ -58,6 +57,7 @@ ipasam_la_LIBADD = \ $(SAMBA40EXTRA_LIBS) \ $(SSSIDMAP_LIBS) \ $(ASN1_UTIL_DIR)/libipaasn1.la \ + $(KRB5_UTIL_DIR)/libutil.la \ $(NULL) EXTRA_DIST = \ diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am index 86a7ce62a..2579fc18b 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am @@ -6,7 +6,6 @@ AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ -I$(PLUGIN_COMMON_DIR) \ - -I$(KRB5_UTIL_DIR) \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -31,7 +30,7 @@ libipa_extdom_extop_la_LDFLAGS = -avoid-version libipa_extdom_extop_la_LIBADD = \ $(LDAP_LIBS) \ - $(SSSNSSIDMAP_LIBS) \ + $(SSSNSSIDMAP_LIBS) \ $(NULL) TESTS = diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index de6150924..7082c9216 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -3,9 +3,6 @@ NULL = MAINTAINERCLEANFILES = *~ Makefile.in PLUGIN_COMMON_DIR = ../common KRB5_UTIL_DIR = ../../../util -KRB5_UTIL_SRCS = $(KRB5_UTIL_DIR)/ipa_krb5.c \ - $(KRB5_UTIL_DIR)/ipa_pwd.c \ - $(KRB5_UTIL_DIR)/ipa_pwd_ntlm.c ASN1_UTIL_DIR=../../../asn1 AM_CPPFLAGS = \ @@ -41,6 +38,7 @@ 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 \ $(NULL) libipa_pwd_extop_la_SOURCES = \ common.c \ |