From 214d03cb0f6c65222589afbd6a78c9bc3df8c743 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 4 May 1997 04:16:26 +0000 Subject: [PATCH] use @LDSHARED@ git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1655 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/des/Makefile.in | 3 ++- lib/editline/Makefile.in | 3 ++- lib/kafs/Makefile.in | 3 ++- lib/otp/Makefile.in | 3 ++- lib/sl/Makefile.in | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index 6478bbb03..07904cce0 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -13,6 +13,7 @@ RANLIB = @RANLIB@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ LD_FLAGS = @LD_FLAGS@ +LDSHARED = @LDSHARED@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -106,7 +107,7 @@ $(LIBNAME).a: $(LIBOBJ) $(LIBNAME).$(SHLIBEXT): $(LIBOBJ) rm -f $@ - $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIBOBJ) + $(LDSHARED) $(SHARED) -o $@ $(LIBOBJ) # To make psoriaris make happy we have to mention these files in some # rule, so we might as well put them here. diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in index bcd638335..4a31ac9c6 100644 --- a/lib/editline/Makefile.in +++ b/lib/editline/Makefile.in @@ -28,6 +28,7 @@ LIBEXT = @LIBEXT@ SHLIBEXT = @SHLIBEXT@ LIBPREFIX = @LIBPREFIX@ SHARED = @SHARED@ +LDSHARED = @LDSHARED@ LIB = $(LIBNAME).$(LIBEXT) SOURCES = edit_compat.c editline.c complete.c sysunix.c @@ -78,6 +79,6 @@ $(LIBNAME).a: $(OBJECTS) $(LIBNAME).$(SHLIBEXT): $(OBJECTS) rm -f $@ - $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS) + $(LDSHARED) $(SHARED) -o $@ $(OBJECTS) $(OBJECTS): ../../include/config.h diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index bbcd7b63a..cf2d97261 100644 --- a/lib/kafs/Makefile.in +++ b/lib/kafs/Makefile.in @@ -28,6 +28,7 @@ LIBEXT = @LIBEXT@ SHLIBEXT = @SHLIBEXT@ LIBPREFIX = @LIBPREFIX@ SHARED = @SHARED@ +LDSHARED = @LDSHARED@ AFS_EXTRA_LIBS = @AFS_EXTRA_LIBS@ LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS) @@ -80,7 +81,7 @@ $(LIBNAME).a: $(OBJECTS) @AFS_EXTRA_OBJS@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS) rm -f $@ - $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS) + $(LDSHARED) $(SHARED) -o $@ $(OBJECTS) # AIX: this almost works with gcc, but somehow it fails to use the # correct ld, use ld instead diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index e9467c141..3d9566e40 100644 --- a/lib/otp/Makefile.in +++ b/lib/otp/Makefile.in @@ -30,6 +30,7 @@ LIBEXT = @LIBEXT@ SHLIBEXT = @SHLIBEXT@ LIBPREFIX = @LIBPREFIX@ SHARED = @SHARED@ +LDSHARED = @LDSHARED@ EXECSUFFIX=@EXECSUFFIX@ LIB = $(LIBNAME).$(LIBEXT) PROGS = otptest$(EXECSUFFIX) @@ -91,7 +92,7 @@ $(LIBNAME).a: $(LIB_OBJECTS) $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS) rm -f $@ - $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIB_OBJECTS) + $(LDSHARED) $(SHARED) -o $@ $(LIB_OBJECTS) $(OBJECTS): ../../include/config.h diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in index 67775b30a..b9e1cc85f 100644 --- a/lib/sl/Makefile.in +++ b/lib/sl/Makefile.in @@ -28,6 +28,7 @@ LIBEXT = @LIBEXT@ SHLIBEXT = @SHLIBEXT@ LIBPREFIX = @LIBPREFIX@ SHARED = @SHARED@ +LDSHARED = @LDSHARED@ LIB = $(LIBNAME).$(LIBEXT) PROGS = @@ -77,7 +78,7 @@ $(LIBNAME).a: $(LIB_OBJECTS) $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS) rm -f $@ - $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIB_OBJECTS) + $(LDSHARED) $(SHARED) -o $@ $(LIB_OBJECTS) $(OBJECTS): ../../include/config.h