From d249ac3c15aefd23b6c47f16cc2843bd136f4fd5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Wed, 18 Mar 2015 17:09:06 +0000
Subject: [PATCH] fix Makefile.am for daemons
---
daemons/Makefile.am | 2 +-
daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am | 1 -
daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 1 -
daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/daemons/Makefile.am b/daemons/Makefile.am
index 956f399b1ed6d399ee52a620dcda5f67d252c848..f919429dcbd29fed3071e8f385d2573354717519 100644
--- a/daemons/Makefile.am
+++ b/daemons/Makefile.am
@@ -1,6 +1,6 @@
# This file will be processed with automake-1.7 to create Makefile.in
#
-AUTOMAKE_OPTIONS = 1.7
+AUTOMAKE_OPTIONS = 1.7 subdir-objects
NULL =
diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am
index 8e35cdbd4499582dd0e14562f05e4eda5bb3ec5b..fba5b08bfc15450ab4864812049699d2cfcbaf05 100644
--- a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am
+++ b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \
- -I$(COMMON_BER_DIR) \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \
diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am
index a1679812ef3c5de8c6e18433cbb991a99ad0b6c8..8ee26a7fe8ef988dbbf2ac357e6702b73e887754 100644
--- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am
+++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(srcdir) \
-I$(PLUGIN_COMMON_DIR) \
-I$(KRB5_UTIL_DIR) \
- -I$(COMMON_BER_DIR) \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
index 1ab6c6704e401810772a5ababc7cc5eec19d2c83..078ff9c8476b8547db58d2cf5c5d941846a3143c 100644
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
-I$(PLUGIN_COMMON_DIR) \
-I$(KRB5_UTIL_DIR) \
-I$(ASN1_UTIL_DIR) \
- -I$(COMMON_BER_DIR) \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
-DLIBDIR=\""$(libdir)"\" \
--
2.1.0