mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-30 11:39:34 -05:00
ITS#10098 fixup passwd module subdirs too
(Squash this)
This commit is contained in:
parent
19cb306eb8
commit
cec59a2860
3 changed files with 24 additions and 9 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue