Skip to content

Commit

Permalink
Revert "ITS#9008 Do the same for contrib Makefiles"
Browse files Browse the repository at this point in the history 
This reverts commit 3fa7d3c.
  • Loading branch information
@quanah
quanah committed May 17, 2019
1 parent 70b57c5 commit 1d0a96e
Show file tree
Hide file tree
Showing 28 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions contrib/slapd-modules/acl/Makefile
View file
Expand Up @@ -33,11 +33,11 @@ all: $(PROGRAMS)

posixgroup.la: posixgroup.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

gssacl.la: gssacl.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/addpartial/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

addpartial.la: addpartial-overlay.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/adremap/Makefile
View file
Expand Up @@ -47,7 +47,7 @@ all: $(PROGRAMS)

adremap.la: adremap.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/allop/Makefile
View file
Expand Up @@ -37,7 +37,7 @@ all: $(PROGRAMS)

allop.la: allop.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/allowed/Makefile
View file
Expand Up @@ -45,7 +45,7 @@ all: $(PROGRAMS)

allowed.la: allowed.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/authzid/Makefile
View file
Expand Up @@ -45,7 +45,7 @@ all: $(PROGRAMS)

authzid.la: authzid.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/autogroup/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

autogroup.la: autogroup.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/cloak/Makefile
View file
Expand Up @@ -37,7 +37,7 @@ all: $(PROGRAMS)

cloak.la: cloak.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/comp_match/Makefile
View file
Expand Up @@ -56,7 +56,7 @@ all: $(PROGRAMS)

compmatch.la: componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/denyop/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

denyop.la: denyop.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/dsaschema/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

dsaschema.la: dsaschema.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/dupent/Makefile
View file
Expand Up @@ -45,7 +45,7 @@ all: $(PROGRAMS)

dupent.la: dupent.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/kinit/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

kinit.la: kinit.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/lastbind/Makefile
View file
Expand Up @@ -47,7 +47,7 @@ all: $(PROGRAMS)

lastbind.la: lastbind.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/lastmod/Makefile
View file
Expand Up @@ -37,7 +37,7 @@ all: $(PROGRAMS)

lastmod.la: lastmod.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/noopsrch/Makefile
View file
Expand Up @@ -45,7 +45,7 @@ all: $(PROGRAMS)

noopsrch.la: noopsrch.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/nops/Makefile
View file
Expand Up @@ -37,7 +37,7 @@ all: $(PROGRAMS)

nops.la: nops.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/nssov/Makefile
View file
Expand Up @@ -66,7 +66,7 @@ $(OBJS): nssov.h

nssov.la: $(OBJS) $(XOBJS)
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-rpath $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS)
-rpath $(moduledir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS)

install: install-lib install-man FORCE

Expand Down
8 changes: 4 additions & 4 deletions contrib/slapd-modules/passwd/Makefile
View file
Expand Up @@ -37,19 +37,19 @@ all: $(PROGRAMS)

pw-kerberos.la: kerberos.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? -lkrb5
-rpath $(moduledir) -module -o $@ $? -lkrb5

pw-netscape.la: netscape.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $?
-rpath $(moduledir) -module -o $@ $?

pw-radius.la: radius.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? -lradius
-rpath $(moduledir) -module -o $@ $? -lradius

pw-apr1.la: apr1.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $?
-rpath $(moduledir) -module -o $@ $?

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/passwd/pbkdf2/Makefile
View file
Expand Up @@ -40,7 +40,7 @@ all: $(PROGRAMS)

pw-pbkdf2.la: pw-pbkdf2.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/passwd/sha2/Makefile
View file
Expand Up @@ -38,7 +38,7 @@ all: $(PROGRAMS)

pw-sha2.la: slapd-sha2.lo sha2.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/passwd/totp/Makefile
View file
Expand Up @@ -37,7 +37,7 @@ all: $(PROGRAMS)

pw-totp.la: slapd-totp.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/proxyOld/Makefile
View file
Expand Up @@ -45,7 +45,7 @@ all: $(PROGRAMS)

proxyOld.la: proxyOld.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
6 changes: 3 additions & 3 deletions contrib/slapd-modules/samba4/Makefile
View file
Expand Up @@ -47,15 +47,15 @@ all: $(PROGRAMS)

pguid.la: pguid.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

rdnval.la: rdnval.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

vernum.la: vernum.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/smbk5pwd/Makefile
View file
Expand Up @@ -56,7 +56,7 @@ all: $(PROGRAMS)

smbk5pwd.la: smbk5pwd.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/trace/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

trace.la: trace.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/usn/Makefile
View file
Expand Up @@ -33,7 +33,7 @@ all: $(PROGRAMS)

usn.la: usn.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down
2 changes: 1 addition & 1 deletion contrib/slapd-modules/vc/Makefile
View file
Expand Up @@ -45,7 +45,7 @@ all: $(PROGRAMS)

vc.la: vc.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-rpath $(libdir) -module -o $@ $? $(LIBS)
-rpath $(moduledir) -module -o $@ $? $(LIBS)

clean:
rm -rf *.o *.lo *.la .libs
Expand Down

0 comments on commit 1d0a96e

Please sign in to comment.