Commit c62d48ed authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#9525 - Rework contrib module builds

Adjust to honor CFLAGS and LDFLAGS
Drop -Wall from the OPTimization flag
parent 8f392914
Pipeline #2557 passed with stage
in 60 minutes and 2 seconds
...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -27,16 +27,16 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -27,16 +27,16 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
posixgroup.la: posixgroup.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
gssacl.la: gssacl.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
addpartial.la: addpartial-overlay.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -41,12 +41,12 @@ man5dir = $(mandir)/man5 ...@@ -41,12 +41,12 @@ man5dir = $(mandir)/man5
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
adremap.la: adremap.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5 ...@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
allop.la: allop.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
allowed.la: allowed.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
authzid.la: authzid.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
autogroup.la: autogroup.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5 ...@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
cloak.la: cloak.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -31,7 +31,7 @@ SSL_LIB = -lcrypto -L$(SSL_DIR)/lib ...@@ -31,7 +31,7 @@ SSL_LIB = -lcrypto -L$(SSL_DIR)/lib
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DLDAP_COMPONENT DEFS = -DLDAP_COMPONENT
INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC) INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC)
LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB) LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB)
...@@ -50,12 +50,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -50,12 +50,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
compmatch.la: componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -52,10 +52,10 @@ include $(dir)/Rules.mk ...@@ -52,10 +52,10 @@ include $(dir)/Rules.mk
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.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 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
denyop.la: denyop.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
dsaschema.la: dsaschema.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
dupent.la: dupent.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = DEFS =
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) -lkrb5 LIBS = $(LDAP_LIB) -lkrb5
...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -27,12 +27,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
kinit.la: kinit.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -41,12 +41,12 @@ man5dir = $(mandir)/man5 ...@@ -41,12 +41,12 @@ man5dir = $(mandir)/man5
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
lastbind.la: lastbind.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ ...@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
CC = gcc CC = gcc
OPT = -g -O2 -Wall OPT = -g -O2
DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC) INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) LIBS = $(LDAP_LIB)
...@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5 ...@@ -31,12 +31,12 @@ man5dir = $(mandir)/man5
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
lastmod.la: lastmod.lo 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) -rpath $(moduledir) -module -o $@ $? $(LIBS)
clean: clean:
......
...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir) ...@@ -39,12 +39,12 @@ moduledir = $(libexecdir)$(ldap_subdir)
.SUFFIXES: .c .o .lo .SUFFIXES: .c .o .lo
.c.lo: .c.lo:
$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
all: $(PROGRAMS) all: $(PROGRAMS)
noopsrch.la: noopsrch.lo noopsrch.la: noopsrch.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \
-rpath $(moduledir)</