ITS#9525 - Rework contrib module builds

Adjust to honor CFLAGS and LDFLAGS
Drop -Wall from the OPTimization flag

diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile
index a67ca242bc034db8ff083b12a0bb5f915ee0e5cc..090575d30fe62c521ccdcb3f6bcee667c8aac9c1 100644 (file)
--- a/contrib/slapd-modules/acl/Makefile
+++ b/contrib/slapd-modules/acl/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,16 +27,16 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 posixgroup.la: posixgroup.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 gssacl.la: gssacl.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile
index 1994f0de7a3ae51ef2687553cd32fd02fd3e5c42..ecb7cd0a3d8ddc810b4641f4171963dceac5377a 100644 (file)
--- a/contrib/slapd-modules/addpartial/Makefile
+++ b/contrib/slapd-modules/addpartial/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 addpartial.la: addpartial-overlay.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile
index 96ebee5636271f681e496bb9c19a56ead54415a3..b008eabd6744363900f2cec64d596d85a76cb9b2 100644 (file)
--- a/contrib/slapd-modules/adremap/Makefile
+++ b/contrib/slapd-modules/adremap/Makefile
@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -41,12 +41,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 adremap.la: adremap.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile
index 96b517bc9ea6d5a73703cfaaaaf10adb4103586c..053f3774acc423fb3ebb5b661665b4ea908ab38f 100644 (file)
--- a/contrib/slapd-modules/allop/Makefile
+++ b/contrib/slapd-modules/allop/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 allop.la: allop.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile
index d15568b29571fdf8f000f00d071fa418cef15c65..c19cc44e66afd52fadaa19c79cc94441cdb1be45 100644 (file)
--- a/contrib/slapd-modules/allowed/Makefile
+++ b/contrib/slapd-modules/allowed/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 allowed.la: allowed.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile
index a2020c596a6ee574003efec0c4f7c1235b361beb..ff072884057a0d235fe51eb4cc4bab3188bf3025 100644 (file)
--- a/contrib/slapd-modules/authzid/Makefile
+++ b/contrib/slapd-modules/authzid/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 authzid.la: authzid.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile
index a3d4659c9a9ccbbabe6fe06be4e24a4234bfa79c..7dd6613cf55e23648222019a855bc97cdbfa5083 100644 (file)
--- a/contrib/slapd-modules/autogroup/Makefile
+++ b/contrib/slapd-modules/autogroup/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 autogroup.la: autogroup.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile
index 656d655772d1004ff0ba24f5ec6aeeadf510cfe6..c54e6b13435529383d2d7570300c013f6cf4540a 100644 (file)
--- a/contrib/slapd-modules/cloak/Makefile
+++ b/contrib/slapd-modules/cloak/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 cloak.la: cloak.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile
index 66c68553b2d8208617132229b792debb7d4d21ba..5c65ad3c42da166cd85b171d690d55520ac68dce 100644 (file)
--- a/contrib/slapd-modules/comp_match/Makefile
+++ b/contrib/slapd-modules/comp_match/Makefile
@@ -31,7 +31,7 @@ SSL_LIB = -lcrypto -L$(SSL_DIR)/lib
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DLDAP_COMPONENT
 INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC)
 LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB)
@@ -50,12 +50,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 compmatch.la: componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/datamorph/Makefile b/contrib/slapd-modules/datamorph/Makefile
index 156a20503d1fa743c674f30e11502d28c4afbe8b..e641ca6fac1fe8772fcada771b20986fcf876a51 100644 (file)
--- a/contrib/slapd-modules/datamorph/Makefile
+++ b/contrib/slapd-modules/datamorph/Makefile
@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -52,10 +52,10 @@ include $(dir)/Rules.mk
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 datamorph.la: datamorph.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
                -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile
index b52fe0e3ee5f45a4ee16cd5177783a8fc935840f..2cea18b063d4f0b7a08427cfa2d4e088d4581de1 100644 (file)
--- a/contrib/slapd-modules/denyop/Makefile
+++ b/contrib/slapd-modules/denyop/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 denyop.la: denyop.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile
index f2a106d0cf84588dfb33ab48302b94775d5752c5..3a88fc01f722103214a253fe88c7fc9bd938cfd2 100644 (file)
--- a/contrib/slapd-modules/dsaschema/Makefile
+++ b/contrib/slapd-modules/dsaschema/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 dsaschema.la: dsaschema.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile
index 5c51b116a62a2a7a98d4ca3777fd66cc52cc5027..f680dffe946bef830b78ee4ee156c652523bba0b 100644 (file)
--- a/contrib/slapd-modules/dupent/Makefile
+++ b/contrib/slapd-modules/dupent/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 dupent.la: dupent.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile
index 1d9cd18637560f19e72b1f60813e32e391dd71f7..7b25ced7615f558bdc738ca09efdd3c280a3ced5 100644 (file)
--- a/contrib/slapd-modules/kinit/Makefile
+++ b/contrib/slapd-modules/kinit/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB) -lkrb5
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 kinit.la: kinit.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile
index b120e65160ea5689d614aaa044cce7f3a32e6b45..c273cd3a0cbf06b62b43fc3950b50a2bfc4bf93d 100644 (file)
--- a/contrib/slapd-modules/lastbind/Makefile
+++ b/contrib/slapd-modules/lastbind/Makefile
@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -41,12 +41,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 lastbind.la: lastbind.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile
index 3fd1218989bd0ad2ae70a4a17e97f2b0d4db5b7e..9b06c28fbfe5883f6778dcec5f745b0055593437 100644 (file)
--- a/contrib/slapd-modules/lastmod/Makefile
+++ b/contrib/slapd-modules/lastmod/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 lastmod.la: lastmod.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile
index 0a9b0565878441afc76fd81b923c7af8d8cfab7b..0a1c24a94b7ca7f1f441e6298b7a24528363cc0a 100644 (file)
--- a/contrib/slapd-modules/noopsrch/Makefile
+++ b/contrib/slapd-modules/noopsrch/Makefile
@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 noopsrch.la: noopsrch.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile
index 602f3cb155710891bcbdd5e87907fa28fa062873..94a5bcd23ce49c458cb87241530c84cd8c6d388d 100644 (file)
--- a/contrib/slapd-modules/nops/Makefile
+++ b/contrib/slapd-modules/nops/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 nops.la: nops.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile
index f1e3bb8273da3af917e8e1fabfe64653e8b14109..5e36b555fc65afbaf995159c9d7ca8d16be48ee4 100644 (file)
--- a/contrib/slapd-modules/nssov/Makefile
+++ b/contrib/slapd-modules/nssov/Makefile
@@ -27,7 +27,7 @@ NLDAPD_INC=-Inss-pam-ldapd
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
-OPT = -g -O2 -Wall
+OPT = -g -O2
 CC = gcc
 DEFS =
 INCS = $(LDAP_INC) $(NLDAPD_INC)
@@ -57,15 +57,15 @@ MANPAGES = slapo-nssov.5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 tio.lo:        nss-pam-ldapd/tio.c
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $?
 
 $(OBJS):       nssov.h
 
 nssov.la:      $(OBJS) $(XOBJS)
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 0:0:0 \
        -rpath $(moduledir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS)
 
 install: install-lib install-man FORCE

diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile
index e37193de8d222270fa2e6abc1306025c97bdb4e0..634649603a1364d919550a5fce84ab231305d8df 100644 (file)
--- a/contrib/slapd-modules/passwd/Makefile
+++ b/contrib/slapd-modules/passwd/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -31,24 +31,24 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 pw-kerberos.la:        kerberos.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? -lkrb5
 
 pw-netscape.la:        netscape.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $?
 
 pw-radius.la:  radius.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? -lradius
 
 pw-apr1.la:    apr1.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $?
 
 clean:

diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile
index 6ec9bbda22c91f6f02d18bcfc365b617d16dbde8..6279f50c158668a68558a7bb7b16d17b7dc50507 100644 (file)
--- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
+++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 #DEFS = -DSLAPD_PBKDF2_DEBUG
 
 SSL_INC =
@@ -35,12 +35,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all:           $(PROGRAMS)
 
 pw-pbkdf2.la: pw-pbkdf2.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile
index 45b24db4882efdda7190adc43f25e7c93784b7b5..2d2075688387fbb7c33fe9f759b5d64934ca8bb8 100644 (file)
--- a/contrib/slapd-modules/passwd/sha2/Makefile
+++ b/contrib/slapd-modules/passwd/sha2/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 #DEFS = -DSLAPD_SHA2_DEBUG
 INCS = $(LDAP_INC)
@@ -32,12 +32,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all:           $(PROGRAMS)
 
 pw-sha2.la:    slapd-sha2.lo sha2.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile
index 75dc8d13418679d81e225f3e35a1a4532f22d315..f7dff4bd7d7ba9dc7e7907087b56228ad4efbae5 100644 (file)
--- a/contrib/slapd-modules/passwd/totp/Makefile
+++ b/contrib/slapd-modules/passwd/totp/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all:           $(PROGRAMS)
 
 pw-totp.la:    slapd-totp.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/ppm/Makefile b/contrib/slapd-modules/ppm/Makefile
index 0a90b530e313a6a5ca9f6177e976b1bb66e94229..345fa96d4c4e6b10b2763b1f99ee0df98d5d3c09 100644 (file)
--- a/contrib/slapd-modules/ppm/Makefile
+++ b/contrib/slapd-modules/ppm/Makefile
@@ -18,7 +18,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/li
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall -fpic
+OPT = -g -O2 -fpic
 
 # To skip linking against CRACKLIB make CRACK=no
 CRACK=yes
@@ -61,13 +61,13 @@ TESTS=./unit_tests.sh
 all:   ppm $(TEST)
 
 $(TEST): ppm
-       $(CC) -g $(INCS) $(LDAP_LIBS) -Wl,-rpath=. -o $(TEST) ppm_test.c $(PROGRAMS) $(LDAP_LIBS) $(CRACKLIB)
+       $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(LDFLAGS) $(INCS) $(LDAP_LIBS) -Wl,-rpath=. -o $(TEST) ppm_test.c $(PROGRAMS) $(LDAP_LIBS) $(CRACKLIB)
 
 ppm.o:
-       $(CC) $(OPT) $(DEFS) -c $(INCS) ppm.c
+       $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) -c $(INCS) ppm.c
 
 ppm: ppm.o
-       $(CC) $(INCS) -shared -o $(PROGRAMS) ppm.o $(CRACKLIB)
+       $(CC) $(LDFLAGS) $(INCS) -shared -o $(PROGRAMS) ppm.o $(CRACKLIB)
 
 install: ppm
        mkdir -p $(DESTDIR)$(moduledir)

diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile
index 3618023de98da5628e267fbe704b2632d2a6b018..edaa3a0677fc47a68d57f2ab09994eae370064e9 100644 (file)
--- a/contrib/slapd-modules/proxyOld/Makefile
+++ b/contrib/slapd-modules/proxyOld/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 proxyOld.la:   proxyOld.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/rbac/Makefile b/contrib/slapd-modules/rbac/Makefile
index 188388cbd66694150d7e705e5e15d36c33d162cb..1180bd6a1ab13d83360e434646dcb4f25bd85cc5 100755 (executable)
--- a/contrib/slapd-modules/rbac/Makefile
+++ b/contrib/slapd-modules/rbac/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_RBAC=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -36,12 +36,12 @@ LOBJS = $(patsubst %.c,%.lo,$(SRCS))
 .SUFFIXES: .c .lo
 
 %.lo: %.c rbac.h
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 rbac.la: $(LOBJS)
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
                -rpath $(moduledir) -module -o $@ $^ $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile
index b9945979c5723dda7aad0466e53aca6d8cbb6b5e..726c2381c9f86997c0f611456452d13ca5f348b0 100644 (file)
--- a/contrib/slapd-modules/samba4/Makefile
+++ b/contrib/slapd-modules/samba4/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \
        -DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \
        -DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC
@@ -41,20 +41,20 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 pguid.la: pguid.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 rdnval.la: rdnval.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 vernum.la: vernum.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
index 6a1e83ea783707293c761c0b0ac5de5d079e8080..5f496649322bed3e82ee01fef8794e41b84fdc7f 100644 (file)
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -27,7 +27,7 @@ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
 DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
 INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
@@ -50,12 +50,12 @@ man5dir = $(mandir)/man5
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 smbk5pwd.la:   smbk5pwd.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile
index 830e3898b4a6723e075f40bd50d0de3998fc888d..1bf8a55417135881759f82a4dee39bd894ffa6ae 100644 (file)
--- a/contrib/slapd-modules/trace/Makefile
+++ b/contrib/slapd-modules/trace/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 trace.la: trace.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile
index 0b8795b6d59132d94858e1bff605ffa661918dba..d7af04b10278942910c343a159c3215ffef3ff5d 100644 (file)
--- a/contrib/slapd-modules/usn/Makefile
+++ b/contrib/slapd-modules/usn/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_USN=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 usn.la: usn.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/variant/Makefile b/contrib/slapd-modules/variant/Makefile
index 00d9f7364f038468953db41075b48e6809854327..37a5ced1292baa18e129b43a2b290d03204a14db 100644 (file)
--- a/contrib/slapd-modules/variant/Makefile
+++ b/contrib/slapd-modules/variant/Makefile
@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 LIBTOOL = $(LDAP_BUILD)/libtool
 INSTALL = /usr/bin/install
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = -DSLAPD_OVER_VARIANT=SLAPD_MOD_DYNAMIC
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -52,10 +52,10 @@ include $(dir)/Rules.mk
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 variant.la: variant.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
                -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:

diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile
index b3d9c9a6bd1f2b02e76c2987a6ca678d2ed1665b..dcdca1703ea7d1c1ba9ae7874ccd2e1c6558249d 100644 (file)
--- a/contrib/slapd-modules/vc/Makefile
+++ b/contrib/slapd-modules/vc/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 
 LIBTOOL = $(LDAP_BUILD)/libtool
 CC = gcc
-OPT = -g -O2 -Wall
+OPT = -g -O2
 DEFS = 
 INCS = $(LDAP_INC)
 LIBS = $(LDAP_LIB)
@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
+       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
 
 all: $(PROGRAMS)
 
 vc.la: vc.lo
-       $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
+       $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
        -rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean: