diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-10-20 01:23:27 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-10-20 01:23:27 +0000 |
| commit | 4245accc03ee427eee87435287434209c4fc1022 (patch) | |
| tree | bad8b7259d55937481ece348c9aa053f84696e02 | |
| parent | 42fd55bd618fbc61769322c33eabcecb909c2d48 (diff) | |
| download | samba-4245accc03ee427eee87435287434209c4fc1022.tar.gz samba-4245accc03ee427eee87435287434209c4fc1022.tar.bz2 samba-4245accc03ee427eee87435287434209c4fc1022.zip | |
fixed LDSHFLAGS when using non-standard lib locations
(This used to be commit d23772c306c641a74b5c08c68550c684c206b1a5)
| -rw-r--r-- | source3/Makefile.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 504e731a88..7e2a2e6be7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -13,6 +13,7 @@ SHLD=@SHLD@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ +LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ AWK=@AWK@ TERMLDFLAGS=@TERMLDFLAGS@ @@ -617,15 +618,15 @@ bin/smbw_sample: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) @echo Linking shared library $@ - @$(LD) @LDSHFLAGS@ -o $@ $(PICOBJS) $(LIBS) + @$(LD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32) @echo Linking shared library $@ - @$(LD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS) + @$(LD) -32 $(LDSHFLAGS) -o $@ $(PICOBJS32) $(LIBS) bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) echo Linking libsmbclient shared library $@ - $(SHLD) @LDSHFLAGS@ -o $@ $(LIBSMBCLIENT_PICOBJS) $(LIBS) + $(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LIBS) bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) @echo Linking libsmbclient non-shared library $@ @@ -639,7 +640,7 @@ bin/smbsh: $(SMBSH_OBJ) bin/.dummy nsswitch/libnss_wins.so: $(NSS_OBJ) @echo "Linking $@" - @$(LD) @LDSHFLAGS@ -o $@ $(NSS_OBJ) -lc + @$(LD) $(LDSHFLAGS) -o $@ $(NSS_OBJ) -lc bin/winbindd: $(WINBINDD_OBJ) bin/.dummy @echo Linking $@ @@ -647,11 +648,11 @@ bin/winbindd: $(WINBINDD_OBJ) bin/.dummy nsswitch/libnss_winbind.so: $(WINBIND_NSS_PICOBJS) @echo "Linking $@" - @$(LINK) @LDSHFLAGS@ -o $@ $(WINBIND_NSS_PICOBJS) + @$(LINK) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) bin/.dummy @echo Linking $@ - @$(LINK) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) + @$(LINK) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) $(UBIQX_OBJ) bin/.dummy @echo Linking $@ @@ -660,7 +661,7 @@ bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) $(UBIQX_OBJ) bi bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ) @echo "Linking shared library $@" - $(LD) @LDSHFLAGS@ -symbolic -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(LIBS) -lc + $(LD) $(LDSHFLAGS) -symbolic -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(LIBS) -lc install: installbin installman installscripts installswat |