Imported Upstream version 4.7.2

daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am

@@ -1,34 +1,29 @@
 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
+PLUGIN_COMMON_DIR = $(srcdir)/../common
 
 AM_CPPFLAGS =							\
-	-I.							\
 	-I$(srcdir)						\
-	-I$(srcdir)/../libotp					\
 	-I$(PLUGIN_COMMON_DIR)					\
-	-I$(KRB5_UTIL_DIR)					\
-	-I$(COMMON_BER_DIR)					\
+	-I$(top_srcdir)/util					\
+	-I$(top_srcdir)/asn1					\
 	-DPREFIX=\""$(prefix)"\" 				\
 	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBDIR=\""$(libdir)"\" 				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DDATADIR=\""$(datadir)"\"				\
-	$(LDAP_CFLAGS)					\
+	$(DIRSRV_CFLAGS)					\
+	$(CRYPTO_CFLAGS)					\
+	$(LDAP_CFLAGS)						\
 	$(KRB5_CFLAGS)						\
-	$(SSL_CFLAGS)						\
+	$(NSPR_CFLAGS)						\
 	$(NSS_CFLAGS)						\
 	$(WARN_CFLAGS)						\
 	$(NULL)
 
 AM_LDFLAGS = \
+	$(CRYPTO_LIBS)	\
 	$(KRB5_LIBS)	\
-	$(SSL_LIBS)	\
 	$(LDAP_LIBS)	\
 	$(NSPR_LIBS)	\
 	$(NSS_LIBS)	\
@@ -38,14 +33,19 @@ AM_LDFLAGS = \
 # Plugin Binary
 plugindir = $(libdir)/dirsrv/plugins
 plugin_LTLIBRARIES = libipa_pwd_extop.la
-libipa_pwd_extop_la_LIBADD  = $(builddir)/../libotp/libotp.la
+libipa_pwd_extop_la_LIBADD  = \
+	$(builddir)/../libotp/libotp.la \
+	$(top_builddir)/asn1/libipaasn1.la	\
+	$(top_builddir)/util/libutil.la		\
+	$(NULL)
 libipa_pwd_extop_la_SOURCES = 		\
-	authcfg.c			\
 	common.c			\
 	encoding.c			\
 	prepost.c			\
 	ipa_pwd_extop.c			\
-	syncreq.c			\
+	ipapwd.h			\
+	otpctrl.c			\
+	otpctrl.h			\
 	$(KRB5_UTIL_SRCS)		\
 	$(NULL)