upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use -rpath consistently

Browse source
This commit is contained in:
Kurt Zeilenga 2000-10-01 16:33:48 +00:00
parent 003a293e2b
commit 17d9a263d1
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/lib-shared.mk
View file

@ -14,8 +14,8 @@ NT_DYN_LT_NO_UNDEF = -no-undefined
LT_NO_UNDEF = $(@PLAT@_@LIB_LINKAGE@_LT_NO_UNDEF) LT_NO_UNDEF = $(@PLAT@_@LIB_LINKAGE@_LT_NO_UNDEF)
COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(EXTRA_DEFS) -c COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(EXTRA_DEFS) -c
LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link -rpath $(libdir) \
$(LTVERSION) $(LT_NO_UNDEF) $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
MKDEPFLAG = -l MKDEPFLAG = -l
@ -31,7 +31,7 @@ MKDEPFLAG = -l
DYN_EXT=@DYN_EXT@ DYN_EXT=@DYN_EXT@
$(LIBRARY): version.lo $(LIBRARY): version.lo
$(LTLIBLINK) -rpath $(libdir) -o $@ $(OBJS) version.lo $(EXTRA_LIBS) $(LTLIBLINK) -o $@ $(OBJS) version.lo $(EXTRA_LIBS)
$(RM) ../$@ $(RM) ../$@
d=`$(PWD)`; d=`$(BASENAME) $$d`; cd ..; $(LN_S) $$d/$@ $@; \ d=`$(PWD)`; d=`$(BASENAME) $$d`; cd ..; $(LN_S) $$d/$@ $@; \
t=`$(BASENAME) $@ .la`.a; $(RM) $$t; $(LN_S) $$d/.libs/$$t $$t t=`$(BASENAME) $@ .la`.a; $(RM) $$t; $(LN_S) $$d/.libs/$$t $$t

6
build/mod.mk
View file

@ -13,8 +13,8 @@ LIBSTAT = lib$(LIBBASE).a
LTFLAGS = --only-$(LINKAGE) LTFLAGS = --only-$(LINKAGE)
COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c
LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link -rpath $(moduledir) \
$(LTVERSION) $(LT_NO_UNDEF) $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
MKDEPFLAG = -l MKDEPFLAG = -l
@ -33,7 +33,7 @@ version.c: $(OBJS)
$(MKVERSION) $(LIBBASE) > $@ $(MKVERSION) $(LIBBASE) > $@
$(LIBRARY): $(MODDEPS) version.lo $(LIBRARY): $(MODDEPS) version.lo
$(LTLIBLINK) -module -rpath $(moduledir) -o $@ $(OBJS) version.lo \ $(LTLIBLINK) -module -o $@ $(OBJS) version.lo \
$(MODLIBS) $(MODLIBS)
$(LIBSTAT): version.lo $(LIBSTAT): version.lo

3
build/top.mk
View file

@ -57,7 +57,8 @@ MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBVERSION = @OPENLDAP_LIBVERSION@ LIBVERSION = @OPENLDAP_LIBVERSION@
LTVERSION = -version-info $(LIBVERSION) LTVERSION = -version-info $(LIBVERSION)
LTLINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) LTLINK = $(LIBTOOL) --mode=link -rpath $(libdir) \
$(CC) $(CFLAGS) $(LDFLAGS)
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
# Misc UNIX commands used in build environment # Misc UNIX commands used in build environment