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>

7 files changed, 25 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index aefe38dcd..a63cbfd9a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 
 include VERSION
 
-SUBDIRS=asn1 daemons install ipapython ipalib
-CLIENTDIRS=ipapython ipalib client asn1
+SUBDIRS=util asn1 daemons install ipapython ipalib
+CLIENTDIRS=ipapython ipalib client util asn1
 CLIENTPYDIRS=ipaclient ipaplatform
 PYPKGDIRS=$(CLIENTPYDIRS) ipalib ipapython ipaserver ipatests
 
diff --git a/configure.ac b/configure.ac
index 90fdee73b..e89a79a71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,7 @@ AC_CONFIG_FILES([
     daemons/ipa-slapi-plugins/ipa-sidgen/Makefile
     daemons/ipa-slapi-plugins/ipa-range-check/Makefile
     daemons/ipa-slapi-plugins/topology/Makefile
+    util/Makefile
 ])
 
 AC_OUTPUT
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			\
diff --git a/util/Makefile.am b/util/Makefile.am
new file mode 100644
index 000000000..7869bc92b
--- /dev/null
+++ b/util/Makefile.am
@@ -0,0 +1,14 @@
+AUTOMAKE_OPTIONS = 1.7 subdir-objects
+
+AM_CPPFLAGS = $(CRYPTO_CFLAGS) $(KRB5_CFLAGS) $(LDAP_CFLAGS) $(NSS_CFLAGS)
+
+noinst_LTLIBRARIES = libutil.la
+
+libutil_la_SOURCES =	ipa_krb5.c \
+			ipa_krb5.h \
+			ipa_mspac.h \
+			ipa_pwd.c \
+			ipa_pwd.h \
+			ipa_pwd_ntlm.c
+
+libutil_la_LIBADD = $(CRYPTO_LIBS) $(KRB5_LIBS) $(LDAP_LIBS) $(NSS_LIBS)