ITS#10098 contrib: fix Makefiles for Windows

Must build with "make PLAT=NT"

diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile
index 2195e2d7242bea4202cf671e352bc2eee2861241..4d28f7150c549b9ed1ae8b5ecf059f85545335d2 100644 (file)
--- 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 ecb7cd0a3d8ddc810b4641f4171963dceac5377a..9e267ca9fe52d796878d9a84a68e779521110251 100644 (file)
--- 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 b008eabd6744363900f2cec64d596d85a76cb9b2..a00f89500d0e1b80459cd5708b45cf55eebc0e0b 100644 (file)
--- 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 053f3774acc423fb3ebb5b661665b4ea908ab38f..ea0a87c7bd17dcf144b3cb8c05c1195834652c4b 100644 (file)
--- 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 32cb43241f795c38e3e68ff51961142a99eda862..b9e307361bf5ee3a7b38f613ec16c591e9a02456 100644 (file)
--- 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 ef9c4bc4f69cee1fe9b3a14046eb526fd91886b0..b5472168c88750b19e419288dc5d63c3fd57ce58 100644 (file)
--- 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 7dd6613cf55e23648222019a855bc97cdbfa5083..24466571a13b1be702abebcc44a25c6bf45e7639 100644 (file)
--- 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 2b9c65437823d4998156f5731e8d29a77e0ae30a..86fbf06ca0a83a9d854b992cc00c80525d39fd4c 100644 (file)
--- 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 c54e6b13435529383d2d7570300c013f6cf4540a..6f2cddc96d078264754286c15b8f6846df67f916 100644 (file)
--- 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 9b78c5c12bbddfda53bf84c6453a800aaecebff9..e7527bd2c2213bf741645f92c6b171e31a547d1a 100644 (file)
--- 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 82bce493c594641ef51cc8181684c30860b83463..61c6fa2126744fcdb2410f47537aa37bd0768430 100644 (file)
--- 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 2cea18b063d4f0b7a08427cfa2d4e088d4581de1..866d7bd921aff690e12c4203c9e2a17b5f8e3f63 100644 (file)
--- 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 3a88fc01f722103214a253fe88c7fc9bd938cfd2..617abdcb2fff264c96d422ce231c07cc5b8fe3c8 100644 (file)
--- 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 6b35438622dd87399c340dc53bd09f7eae52bb2c..5ce776dd19a9073fcfd9494cbb1ab9cb6446fc6c 100644 (file)
--- 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 654f8565852f3fb2ca91c81079d905d8700e4d6f..d6e69cde071729afb927d2605660dc19a917e97f 100644 (file)
--- 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 7b25ced7615f558bdc738ca09efdd3c280a3ced5..838d94015b32d10f78f0d2f41b00a436243b9268 100644 (file)
--- 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 c273cd3a0cbf06b62b43fc3950b50a2bfc4bf93d..02e593157a571b75bbc292cffe9a1b1f1d056ff7 100644 (file)
--- 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 9b06c28fbfe5883f6778dcec5f745b0055593437..79c9e91f1f454a2bd2138ac3dda254e213fbe9a6 100644 (file)
--- 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 2934a32146aef60c7152c33502eeb0c3a84b9984..3d6e1503b39087c701249086345a6042bf433835 100644 (file)
--- 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 94a5bcd23ce49c458cb87241530c84cd8c6d388d..1aeb27a30eb8045e55a924b1aac6706b13a6edfd 100644 (file)
--- 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 634649603a1364d919550a5fce84ab231305d8df..021ecb70de5fb82d250844db8515cd8121f0ae50 100644 (file)
--- 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 6279f50c158668a68558a7bb7b16d17b7dc50507..0ed0962dd89e75ee9f929450dcf0a9c15c4a53b9 100644 (file)
--- 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 2d2075688387fbb7c33fe9f759b5d64934ca8bb8..123787ae04e22db98f2da4ea08818a0fb9b109f1 100644 (file)
--- 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 f7dff4bd7d7ba9dc7e7907087b56228ad4efbae5..199fa39fc1e070d7e48778c0938e676c62900908 100644 (file)
--- 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 d92967c39436ace50be325bffd2e16a9b99af233..14545f2e2f00bf5a74fbfb62ad68bb0cb5b70aec 100644 (file)
--- 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 1180bd6a1ab13d83360e434646dcb4f25bd85cc5..e4b16f85a60170f10fbfc444c29a1c7b3e119a3b 100755 (executable)
--- 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 f53d130d27fae446af666a2ae6b47af90f641942..634c0618c83d501474dac71965bd5e6dc13b1693 100644 (file)
--- 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 a1c2c8eefe9bb82c7e58fc48998918ab33d4dc62..76c80801b534395ffe95514ef5f8e779b4fd67eb 100644 (file)
--- 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 1bf8a55417135881759f82a4dee39bd894ffa6ae..c70f6fcec5edc745ee021fd36ec6a69e14b49867 100644 (file)
--- 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 d7af04b10278942910c343a159c3215ffef3ff5d..35e2b91236e0b071884c83d85e6a152ef5412bd1 100644 (file)
--- 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 07effed6cfc8abe03234b8a30cf688e76876a1ea..1be3f3e761b204ee5c85c3d52bd975d0e730e823 100644 (file)
--- 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 9fe67ab27b221d0d0e2da0ec54eb8bcbd7766d2e..3ab76bc3d39610213db046770394d30b7e6b31a6 100644 (file)
--- 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