diff --git a/racket/src/configure b/racket/src/configure index 1e89c9f893..ad1f2f8add 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -655,8 +655,6 @@ collectsdir LTA LTO LIBRACKET_DEP -LIBRKTIO_FOR_LIB -LIBRKTIO_FOR_DLL FOREIGNTARGET FOREIGN_CONVENIENCE FOREIGN_OBJSLIB @@ -6716,8 +6714,6 @@ if test "${enable_shared}" = "yes" ; then FOREIGN_OBJSLIB="\$(FOREIGN_LIB)" MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" STRIP_LIB_DEBUG=":" - LIBRKTIO_FOR_DLL="\$(LIBRKTIO)" - LIBRKTIO_FOR_LIB="" else LIBSFX=a WXLIBS=WXLIBSNORM @@ -6732,8 +6728,6 @@ else PLAIN_CC='$(CC)' FOREIGN_CONVENIENCE="" FOREIGN_OBJSLIB="\$(FOREIGN_OBJS)" - LIBRKTIO_FOR_LIB="\$(LIBRKTIO)" - LIBRKTIO_FOR_DLL="" fi ############## final output ################ @@ -6861,9 +6855,6 @@ LIBS="$LIBS $EXTRALIBS" - - - diff --git a/racket/src/gracket/Makefile.in b/racket/src/gracket/Makefile.in index 23e987bbe3..584f30b753 100644 --- a/racket/src/gracket/Makefile.in +++ b/racket/src/gracket/Makefile.in @@ -60,8 +60,10 @@ ARLIBFLAGS = $(LDFLAGS) $(LDLIBS) GRACKETLINKER = @MZLINKER@ LIBRKTIO = ../rktio/librktio.@LTA@ +LIBRKTIO_a = $(LIBRKTO) +LIBRKTIO_la = -GRACKETLDLIBS@NOT_MINGW@ = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ @LIBRKTIO_FOR_LIB@ $(LDLIBS) +GRACKETLDLIBS@NOT_MINGW@ = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(LIBRKTIO_@LIBSFX@) $(LDLIBS) GRACKETLDLIBS@MINGW@ = ../racket/libracket.dll.a ../racket/libmzgc.dll.a $(LDLIBS) -ldelayimp -static-libgcc GRACKETLDFLAGS = $(LDFLAGS) -L../racket diff --git a/racket/src/gracket/gc2/Makefile.in b/racket/src/gracket/gc2/Makefile.in index 1135f51e65..ea253661a9 100644 --- a/racket/src/gracket/gc2/Makefile.in +++ b/racket/src/gracket/gc2/Makefile.in @@ -90,12 +90,16 @@ wx_mac_LIBS = -framework CoreFoundation GRACKETLINKER = @MZLINKER@ +LIBRKTIO = ../../rktio/librktio.@LTA@ +LIBRKTIO_a = $(LIBRKTO) +LIBRKTIO_la = + GRACKETLIBS_a = $(LDLIBS) GRACKETLIBS_la = -GRACKETMZOBJS_a = $(MZOBJS) ../../rktio/librktio.@LTA@ +GRACKETMZOBJS_a = $(MZOBJS) $(LIBRKTIO) GRACKETMZOBJS_la = -../gracket@MMM@@NOT_OSX@@NOT_MINGW@: grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ @LIBRKTIO_FOR_LIB@ +../gracket@MMM@@NOT_OSX@@NOT_MINGW@: grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ $(LIBRKTIO_@LIBSFX@) $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ grmain.@LTO@ ../../racket/libracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) ../gracket@MMM@@MINGW@: grmain.@LTO@ ../../racket/gc2/libracket3m.dll.a ../gres.o diff --git a/racket/src/racket/Makefile.in b/racket/src/racket/Makefile.in index 7da27e0507..3607fb119f 100644 --- a/racket/src/racket/Makefile.in +++ b/racket/src/racket/Makefile.in @@ -179,9 +179,15 @@ FOREIGN_NOT_USED_LIB = $(FOREIGN_OBJ) FOREIGN_NOT_USED_OBJSLIB = $(FOREIGN_OBJ) LIBRKTIO = ../rktio/librktio.@LTA@ +LIBRKTIO_FOR_DLL_la = $(LIBRKTIO) +LIBRKTIO_FOR_DLL_a = +LIBRKTIO_FOR_LIB_la = +LIBRKTIO_FOR_LIB_a = $(LIBRKTIO) +LIBRKTIO_FOR_DLL = $(LIBRKTIO_FOR_DLL_@LIBSFX@) +LIBRKTIO_FOR_LIB = $(LIBRKTIO_FOR_LIB_@LIBSFX@) -libracket.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB) @LIBRKTIO_FOR_DLL@ - $(NICEAR) $(AR) $(ARFLAGS) libracket.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBRKTIO_FOR_DLL@ @LIBRACKET_DEP@ +libracket.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB) $(LIBRKTIO_FOR_DLL) + $(NICEAR) $(AR) $(ARFLAGS) libracket.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) $(LIBRKTIO_FOR_DLL) @LIBRACKET_DEP@ $(RANLIB) libracket.@LIBSFX@ # Irix sproc, only @@ -190,8 +196,8 @@ sproc.@LTO@: @GCDIR@/sproc.@LTO@ # Unix ---------------------------------------- -racket@CGC@@NOT_OSX@@NOT_MINGW@: libracket.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ @LIBRKTIO_FOR_LIB@ $(SPECIALIZINGOBJECTS) - @MZLINKER@ -o racket@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LIBRKTIO_FOR_LIB@ @LDFLAGS@ @LIBS@ +racket@CGC@@NOT_OSX@@NOT_MINGW@: libracket.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(LIBRKTIO_FOR_LIB) $(SPECIALIZINGOBJECTS) + @MZLINKER@ -o racket@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ $(LIBRKTIO_FOR_LIB) @LDFLAGS@ @LIBS@ mzcom@CGC@@NOT_MINGW@: $(NOOP) diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index 5e2617510c..0305633c2a 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -1647,8 +1647,6 @@ if test "${enable_shared}" = "yes" ; then FOREIGN_OBJSLIB="\$(FOREIGN_LIB)" MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" STRIP_LIB_DEBUG=":" - LIBRKTIO_FOR_DLL="\$(LIBRKTIO)" - LIBRKTIO_FOR_LIB="" else LIBSFX=a WXLIBS=WXLIBSNORM @@ -1663,8 +1661,6 @@ else PLAIN_CC='$(CC)' FOREIGN_CONVENIENCE="" FOREIGN_OBJSLIB="\$(FOREIGN_OBJS)" - LIBRKTIO_FOR_LIB="\$(LIBRKTIO)" - LIBRKTIO_FOR_DLL="" fi ############## final output ################ @@ -1756,9 +1752,6 @@ AC_SUBST(FOREIGN_OBJSLIB) AC_SUBST(FOREIGN_CONVENIENCE) AC_SUBST(FOREIGNTARGET) -AC_SUBST(LIBRKTIO_FOR_DLL) -AC_SUBST(LIBRKTIO_FOR_LIB) - AC_SUBST(LIBRACKET_DEP) AC_SUBST(LTO) diff --git a/racket/src/racket/gc2/Makefile.in b/racket/src/racket/gc2/Makefile.in index 69ae5781d0..90fbce8809 100644 --- a/racket/src/racket/gc2/Makefile.in +++ b/racket/src/racket/gc2/Makefile.in @@ -500,19 +500,28 @@ FOREIGN_NOT_USED_LIB = $(FOREIGN_OBJ) FOREIGN_NOT_USED_OBJSLIB = LIBRKTIO = ../../rktio/librktio.@LTA@ +LIBRKTIO_FOR_DLL_la = $(LIBRKTIO) +LIBRKTIO_FOR_DLL_a = +LIBRKTIO_FOR_LIB_la = +LIBRKTIO_FOR_LIB_a = $(LIBRKTIO) +LIBRKTIO_UP_FOR_LIB_la = +LIBRKTIO_UP_FOR_LIB_a = gc2/$(LIBRKTIO) +LIBRKTIO_FOR_DLL = $(LIBRKTIO_FOR_DLL_@LIBSFX@) +LIBRKTIO_FOR_LIB = $(LIBRKTIO_FOR_LIB_@LIBSFX@) +LIBRKTIO_UP_FOR_LIB = $(LIBRKTIO_UP_FOR_LIB_@LIBSFX@) EXTRA_GMP_DEP_FILE = ../src/@EXTRA_GMP_OBJ@ EXTRA_GMP = @EXTRA_GMP_DEP@ -EXTRA_OBJS_T = $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB) @LIBRKTIO_FOR_DLL@ -EXTRA_OBJS_L = $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBRKTIO_FOR_DLL@ +EXTRA_OBJS_T = $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB) $(LIBRKTIO_FOR_DLL) +EXTRA_OBJS_L = $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) $(LIBRKTIO_FOR_DLL) -../libracket3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) gc2.@LTO@ @LIBRKTIO_FOR_DLL@ - $(NICEAR) $(AR) $(ARFLAGS) ../libracket3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@ @LIBRKTIO_FOR_DLL@ +../libracket3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) gc2.@LTO@ + $(NICEAR) $(AR) $(ARFLAGS) ../libracket3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@ $(RANLIB) ../libracket3m.@LIBSFX@ -../racket@MMM@@NOT_OSX@@NOT_MINGW@: main.@LTO@ ../libracket3m.@LIBSFX@ @LIBRKTIO_FOR_LIB@ - cd ..; @MZLINKER@ -o racket@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libracket3m.@LIBSFX@ gc2/@LIBRKTIO_FOR_LIB@ @LDFLAGS@ $(LIBS) +../racket@MMM@@NOT_OSX@@NOT_MINGW@: main.@LTO@ ../libracket3m.@LIBSFX@ $(LIBRKTIO_FOR_LIB) + cd ..; @MZLINKER@ -o racket@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libracket3m.@LIBSFX@ $(LIBRKTIO_UP_FOR_LIB) @LDFLAGS@ $(LIBS) # The above "cd .." prevents a problem with libtool's generated script in --enable-shared mode, # at least for Mac OS X. Beware of changing LIBS or LDFLAGS to inclucde something with a relative diff --git a/racket/src/rktio/Makefile.in b/racket/src/rktio/Makefile.in index 482c6cfd1b..9bc9802a41 100644 --- a/racket/src/rktio/Makefile.in +++ b/racket/src/rktio/Makefile.in @@ -8,7 +8,7 @@ LIBS = @LIBS@ RKTLINKER = @RKTLINKER@ NICEAR = $(srcdir)/../utils/nicear -AR = @AR@ +STATIC_AR = @STATIC_AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ @@ -32,7 +32,7 @@ OBJS = rktio_fs.@LTO@ \ rktio_main.@LTO@ librktio.@LTA@: $(OBJS) - $(NICEAR) $(AR) $(ARFLAGS) librktio.@LTA@ $(OBJS) + $(NICEAR) $(STATIC_AR) $(ARFLAGS) librktio.@LTA@ $(OBJS) $(RANLIB) librktio.@LTA@ demo: rktio_demo