diff options
-rw-r--r-- | daemons/ipa-otpd/Makefile.am | 4 | ||||
-rw-r--r-- | daemons/ipa-sam/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-dns/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 3 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-version/Makefile.am | 1 | ||||
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am | 1 | ||||
-rw-r--r-- | freeipa.spec.in | 1 | ||||
-rw-r--r-- | ipa-client/Makefile.am | 1 |
16 files changed, 3 insertions, 18 deletions
diff --git a/daemons/ipa-otpd/Makefile.am b/daemons/ipa-otpd/Makefile.am index ed99c3ecb..af82a5fe0 100644 --- a/daemons/ipa-otpd/Makefile.am +++ b/daemons/ipa-otpd/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS := $(CFLAGS) @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ -AM_LDFLAGS := $(LDFLAGS) @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ +AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ +AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ noinst_HEADERS = internal.h libexec_PROGRAMS = ipa-otpd diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am index e8e22503a..d55a18770 100644 --- a/daemons/ipa-sam/Makefile.am +++ b/daemons/ipa-sam/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ -DLDAPIDIR=\""$(localstatedir)/run"\" \ -DHAVE_LDAP \ -I $(KRB5_UTIL_DIR) \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am index f669d6b56..70b08835e 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NDRNBT_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am index 6d09c8d9c..31b7485e3 100644 --- a/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-dns/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am index 7ba754a48..3ce37ac10 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am index df0c30562..7099a9888 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(SSSIDMAP_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am index 0c69f4d7f..6e4c31aa5 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am index 9fbd03397..a3f8d4f7b 100644 --- a/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index b53b2e1e4..8bd89653d 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -18,13 +18,12 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(SSL_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) - + AM_LDFLAGS = \ $(KRB5_LIBS) \ $(SSL_LIBS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am index f23a24ed8..5aa9b5485 100644 --- a/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am index 4bfb0185e..642fdd599 100644 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am index 738290170..061d84833 100644 --- a/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am index 5396bda99..afce915a0 100644 --- a/daemons/ipa-slapi-plugins/ipa-version/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-version/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am index c41692864..3108f3c15 100644 --- a/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) diff --git a/freeipa.spec.in b/freeipa.spec.in index 2a4d8fcb8..b7c4b729a 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -321,7 +321,6 @@ This package contains tests that verify IPA functionality. %build export CFLAGS="%{optflags} $CFLAGS" -export CPPFLAGS="%{optflags} $CPPFLAGS" export LDFLAGS="%{__global_ldflags} $LDFLAGS" %if 0%{?fedora} >= 19 export SUPPORTED_PLATFORM=fedora19 diff --git a/ipa-client/Makefile.am b/ipa-client/Makefile.am index ca251ae9d..2df175e53 100644 --- a/ipa-client/Makefile.am +++ b/ipa-client/Makefile.am @@ -25,7 +25,6 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ - $(AM_CFLAGS) \ $(KRB5_CFLAGS) \ $(OPENLDAP_CFLAGS) \ $(SASL_CFLAGS) \ |