From 180a58817fc7407d847d9871dfdafe469d654773 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 14 Sep 2023 20:31:41 +0100 Subject: [PATCH] ITS#10098 contrib: fix Makefiles for Windows Must build with "make PLAT=NT" --- contrib/slapd-modules/acl/Makefile | 17 ++++++++++------- contrib/slapd-modules/addpartial/Makefile | 11 ++++++++--- contrib/slapd-modules/adremap/Makefile | 11 ++++++++--- contrib/slapd-modules/allop/Makefile | 11 ++++++++--- contrib/slapd-modules/allowed/Makefile | 11 ++++++++--- contrib/slapd-modules/authzid/Makefile | 11 ++++++++--- contrib/slapd-modules/autogroup/Makefile | 11 ++++++++--- contrib/slapd-modules/ciboolean/Makefile | 11 ++++++++--- contrib/slapd-modules/cloak/Makefile | 11 ++++++++--- contrib/slapd-modules/comp_match/Makefile | 11 ++++++++--- contrib/slapd-modules/datamorph/Makefile | 11 ++++++++--- contrib/slapd-modules/denyop/Makefile | 11 ++++++++--- contrib/slapd-modules/dsaschema/Makefile | 11 ++++++++--- contrib/slapd-modules/dupent/Makefile | 11 ++++++++--- contrib/slapd-modules/emptyds/Makefile | 11 ++++++++--- contrib/slapd-modules/kinit/Makefile | 11 ++++++++--- contrib/slapd-modules/lastbind/Makefile | 11 ++++++++--- contrib/slapd-modules/lastmod/Makefile | 11 ++++++++--- contrib/slapd-modules/noopsrch/Makefile | 11 ++++++++--- contrib/slapd-modules/nops/Makefile | 11 ++++++++--- contrib/slapd-modules/passwd/Makefile | 20 +++++++++++--------- contrib/slapd-modules/passwd/pbkdf2/Makefile | 11 ++++++++--- contrib/slapd-modules/passwd/sha2/Makefile | 11 ++++++++--- contrib/slapd-modules/passwd/totp/Makefile | 11 ++++++++--- contrib/slapd-modules/proxyOld/Makefile | 11 ++++++++--- contrib/slapd-modules/rbac/Makefile | 11 ++++++++--- contrib/slapd-modules/samba4/Makefile | 17 ++++++++++------- contrib/slapd-modules/smbk5pwd/Makefile | 11 ++++++++--- contrib/slapd-modules/trace/Makefile | 11 ++++++++--- contrib/slapd-modules/usn/Makefile | 11 ++++++++--- contrib/slapd-modules/variant/Makefile | 11 ++++++++--- contrib/slapd-modules/vc/Makefile | 11 ++++++++--- 32 files changed, 263 insertions(+), 110 deletions(-) diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile index 2195e2d724..4d28f7150c 100644 --- a/contrib/slapd-modules/acl/Makefile +++ b/contrib/slapd-modules/acl/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = posixgroup.la gssacl.la now.la LTVER = 0:0:0 @@ -32,16 +38,13 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) posixgroup.la: posixgroup.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) gssacl.la: gssacl.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) now.la: now.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile index ecb7cd0a3d..9e267ca9fe 100644 --- a/contrib/slapd-modules/addpartial/Makefile +++ b/contrib/slapd-modules/addpartial/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = addpartial.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) addpartial.la: addpartial-overlay.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile index b008eabd67..a00f89500d 100644 --- a/contrib/slapd-modules/adremap/Makefile +++ b/contrib/slapd-modules/adremap/Makefile @@ -16,13 +16,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = adremap.la MANPAGES = slapo-adremap.5 @@ -46,8 +52,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) adremap.la: adremap.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile index 053f3774ac..ea0a87c7bd 100644 --- a/contrib/slapd-modules/allop/Makefile +++ b/contrib/slapd-modules/allop/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = allop.la MANPAGES = slapo-allop.5 @@ -36,8 +42,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) allop.la: allop.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile index 32cb43241f..b9e307361b 100644 --- a/contrib/slapd-modules/allowed/Makefile +++ b/contrib/slapd-modules/allowed/Makefile @@ -18,12 +18,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = allowed.la LTVER = 0:0:0 @@ -44,8 +50,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) allowed.la: allowed.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile index ef9c4bc4f6..b5472168c8 100644 --- a/contrib/slapd-modules/authzid/Makefile +++ b/contrib/slapd-modules/authzid/Makefile @@ -18,12 +18,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = authzid.la LTVER = 0:0:0 @@ -44,8 +50,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) authzid.la: authzid.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile index 7dd6613cf5..24466571a1 100644 --- a/contrib/slapd-modules/autogroup/Makefile +++ b/contrib/slapd-modules/autogroup/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = autogroup.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) autogroup.la: autogroup.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/ciboolean/Makefile b/contrib/slapd-modules/ciboolean/Makefile index 2b9c654378..86fbf06ca0 100644 --- a/contrib/slapd-modules/ciboolean/Makefile +++ b/contrib/slapd-modules/ciboolean/Makefile @@ -20,13 +20,19 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ SRCDIR = ./ +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_MOD_CIBOOLEAN=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = ciboolean.la MANPAGES = slapo-ciboolean.5 @@ -56,8 +62,7 @@ include $(dir)/Rules.mk ciboolean.la: ciboolean.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf $(CLEAN) diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile index c54e6b1343..6f2cddc96d 100644 --- a/contrib/slapd-modules/cloak/Makefile +++ b/contrib/slapd-modules/cloak/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = cloak.la MANPAGES = slapo-cloak.5 @@ -36,8 +42,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) cloak.la: cloak.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile index 9b78c5c12b..e7527bd2c2 100644 --- a/contrib/slapd-modules/comp_match/Makefile +++ b/contrib/slapd-modules/comp_match/Makefile @@ -29,12 +29,18 @@ SSL_DIR = /usr/local SSL_INC = -I$(SSL_DIR)/include/openssl SSL_LIB = -lcrypto -L$(SSL_DIR)/lib +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = -DLDAP_COMPONENT INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC) -LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = compmatch.la LTVER = 0:0:0 @@ -55,8 +61,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) compmatch.la: componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/datamorph/Makefile b/contrib/slapd-modules/datamorph/Makefile index 82bce493c5..61c6fa2126 100644 --- a/contrib/slapd-modules/datamorph/Makefile +++ b/contrib/slapd-modules/datamorph/Makefile @@ -19,13 +19,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = datamorph.la MANPAGES = slapo-datamorph.5 @@ -55,8 +61,7 @@ include $(dir)/Rules.mk $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $< datamorph.la: datamorph.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf $(CLEAN) diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile index 2cea18b063..866d7bd921 100644 --- a/contrib/slapd-modules/denyop/Makefile +++ b/contrib/slapd-modules/denyop/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = denyop.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) denyop.la: denyop.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile index 3a88fc01f7..617abdcb2f 100644 --- a/contrib/slapd-modules/dsaschema/Makefile +++ b/contrib/slapd-modules/dsaschema/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = dsaschema.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) dsaschema.la: dsaschema.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile index 6b35438622..5ce776dd19 100644 --- a/contrib/slapd-modules/dupent/Makefile +++ b/contrib/slapd-modules/dupent/Makefile @@ -18,12 +18,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = dupent.la LTVER = 0:0:0 @@ -44,8 +50,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) dupent.la: dupent.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/emptyds/Makefile b/contrib/slapd-modules/emptyds/Makefile index 654f856585..d6e69cde07 100644 --- a/contrib/slapd-modules/emptyds/Makefile +++ b/contrib/slapd-modules/emptyds/Makefile @@ -18,13 +18,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_EDS=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = emptyds.la MANPAGES = slapo-emptyds.5 @@ -56,8 +62,7 @@ include $(dir)/Rules.mk all: $(PROGRAMS) emptyds.la: emptyds.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf $(CLEAN) diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile index 7b25ced761..838d94015b 100644 --- a/contrib/slapd-modules/kinit/Makefile +++ b/contrib/slapd-modules/kinit/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) -lkrb5 +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) -lkrb5 +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = kinit.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) kinit.la: kinit.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile index c273cd3a0c..02e593157a 100644 --- a/contrib/slapd-modules/lastbind/Makefile +++ b/contrib/slapd-modules/lastbind/Makefile @@ -16,13 +16,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = lastbind.la MANPAGES = slapo-lastbind.5 @@ -46,8 +52,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) lastbind.la: lastbind.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile index 9b06c28fbf..79c9e91f1f 100644 --- a/contrib/slapd-modules/lastmod/Makefile +++ b/contrib/slapd-modules/lastmod/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = lastmod.la MANPAGES = slapo-lastmod.5 @@ -36,8 +42,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) lastmod.la: lastmod.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile index 2934a32146..3d6e1503b3 100644 --- a/contrib/slapd-modules/noopsrch/Makefile +++ b/contrib/slapd-modules/noopsrch/Makefile @@ -18,12 +18,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 -Wall DEFS = -DSLAPD_OVER_NOOPSRCH=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = noopsrch.la LTVER = 0:0:0 @@ -44,8 +50,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) noopsrch.la: noopsrch.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile index 94a5bcd23c..1aeb27a30e 100644 --- a/contrib/slapd-modules/nops/Makefile +++ b/contrib/slapd-modules/nops/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = nops.la MANPAGES = slapo-nops.5 @@ -36,8 +42,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) nops.la: nops.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile index 634649603a..021ecb70de 100644 --- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = pw-kerberos.la pw-netscape.la pw-radius.la pw-apr1.la MANPAGES = slapd-pw-radius.5 @@ -36,20 +42,16 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) pw-kerberos.la: kerberos.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? -lkrb5 + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) pw-netscape.la: netscape.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) pw-radius.la: radius.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? -lradius + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) pw-apr1.la: apr1.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile index 6279f50c15..0ed0962dd8 100644 --- a/contrib/slapd-modules/passwd/pbkdf2/Makefile +++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile @@ -6,6 +6,11 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc @@ -16,7 +21,8 @@ SSL_INC = SSL_LIB = -lcrypto INCS = $(LDAP_INC) $(SSL_INC) -LIBS = $(LDAP_LIB) $(SSL_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) $(SSL_LIB) +LD_FLAGS= $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = pw-pbkdf2.la MANPAGES = slapd-pw-pbkdf2.5 @@ -40,8 +46,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) pw-pbkdf2.la: pw-pbkdf2.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile index 2d20756883..123787ae04 100644 --- a/contrib/slapd-modules/passwd/sha2/Makefile +++ b/contrib/slapd-modules/passwd/sha2/Makefile @@ -6,6 +6,11 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc @@ -13,7 +18,8 @@ OPT = -g -O2 DEFS = #DEFS = -DSLAPD_SHA2_DEBUG INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = pw-sha2.la MANPAGES = slapd-pw-sha2.5 @@ -37,8 +43,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) pw-sha2.la: slapd-sha2.lo sha2.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile index f7dff4bd7d..199fa39fc1 100644 --- a/contrib/slapd-modules/passwd/totp/Makefile +++ b/contrib/slapd-modules/passwd/totp/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = pw-totp.la MANPAGES = slapo-totp.5 @@ -36,8 +42,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) pw-totp.la: slapd-totp.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile index d92967c394..14545f2e2f 100644 --- a/contrib/slapd-modules/proxyOld/Makefile +++ b/contrib/slapd-modules/proxyOld/Makefile @@ -18,12 +18,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = proxyOld.la LTVER = 0:0:0 @@ -44,8 +50,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) proxyOld.la: proxyOld.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/rbac/Makefile b/contrib/slapd-modules/rbac/Makefile index 1180bd6a1a..e4b16f85a6 100755 --- a/contrib/slapd-modules/rbac/Makefile +++ b/contrib/slapd-modules/rbac/Makefile @@ -6,13 +6,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_RBAC=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = rbac.la MANPAGES = slapo-rbac.5 @@ -41,8 +47,7 @@ LOBJS = $(patsubst %.c,%.lo,$(SRCS)) all: $(PROGRAMS) rbac.la: $(LOBJS) - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $^ $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile index f53d130d27..634c0618c8 100644 --- a/contrib/slapd-modules/samba4/Makefile +++ b/contrib/slapd-modules/samba4/Makefile @@ -18,6 +18,11 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 @@ -25,7 +30,8 @@ DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \ -DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \ -DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = pguid.la rdnval.la vernum.la LTVER = 0:0:0 @@ -46,16 +52,13 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) pguid.la: pguid.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) rdnval.la: rdnval.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) vernum.la: vernum.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile index a1c2c8eefe..76c80801b5 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -24,6 +24,11 @@ SSL_LIB = -lcrypto HEIMDAL_INC = -I/usr/heimdal/include HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc @@ -31,7 +36,8 @@ 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) -LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = smbk5pwd.la MANPAGES = slapo-smbk5pwd.5 @@ -55,8 +61,7 @@ man5dir = $(mandir)/man5 all: $(PROGRAMS) smbk5pwd.la: smbk5pwd.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile index 1bf8a55417..c70f6fcec5 100644 --- a/contrib/slapd-modules/trace/Makefile +++ b/contrib/slapd-modules/trace/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = trace.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) trace.la: trace.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile index d7af04b102..35e2b91236 100644 --- a/contrib/slapd-modules/usn/Makefile +++ b/contrib/slapd-modules/usn/Makefile @@ -6,12 +6,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_USN=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = usn.la LTVER = 0:0:0 @@ -32,8 +38,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) usn.la: usn.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/variant/Makefile b/contrib/slapd-modules/variant/Makefile index 07effed6cf..1be3f3e761 100644 --- a/contrib/slapd-modules/variant/Makefile +++ b/contrib/slapd-modules/variant/Makefile @@ -19,13 +19,19 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool INSTALL = /usr/bin/install CC = gcc OPT = -g -O2 DEFS = -DSLAPD_OVER_VARIANT=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = variant.la MANPAGES = slapo-variant.5 @@ -55,8 +61,7 @@ include $(dir)/Rules.mk $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(CPPFLAGS) $(DEFS) $(INCS) -c $< variant.la: variant.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf $(CLEAN) diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile index 9fe67ab27b..3ab76bc3d3 100644 --- a/contrib/slapd-modules/vc/Makefile +++ b/contrib/slapd-modules/vc/Makefile @@ -18,12 +18,18 @@ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/s LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la +PLAT = UNIX +NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd +NT_LDFLAGS = -no-undefined -avoid-version +UNIX_LDFLAGS = -version-info $(LTVER) + LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc OPT = -g -O2 DEFS = INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) +LIBS = $($(PLAT)_LIB) $(LDAP_LIB) +LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module PROGRAMS = vc.la LTVER = 0:0:0 @@ -44,8 +50,7 @@ moduledir = $(libexecdir)$(ldap_subdir) all: $(PROGRAMS) vc.la: vc.lo - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + $(LIBTOOL) --mode=link $(CC) $(LD_FLAGS) -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs -- 2.47.3