From 3dd264cc0fae7e372121360959c3ee1e081b0596 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 13 Jan 1998 18:57:24 +0000 Subject: [PATCH] Deleted targets used only by Jim Fulton's now deleted "gMakefile". Also change the build rules to use $(LIBRARY) instead of -L.. -lpython$(VERSION) since the latter trips up the SunOS 4.1.x linker (sigh). --- Modules/Makefile.pre.in | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in index 91c73f1f38..076fada088 100644 --- a/Modules/Makefile.pre.in +++ b/Modules/Makefile.pre.in @@ -106,13 +106,6 @@ REALLIBRARY= ../@REALLIBRARY@ all: $(OBJS) -# Targets for Jim Fulton's extension Makefiles -- are these still needed? -asharedmodule: $(ASHAREDMODULE)$(SO) - -$(ASHAREDMODULE)$(SO): $(ASHAREDMODULESOBS) - $(LDSHARED) $(LDFLAGS) -o $(ASHAREDMODULE)$(SO) $(ASHAREDMODULESOBS) \ - $(ASHAREDMODULESEXTRA) - # This target is used by the master Makefile to add the objects to the library. # To deal with the conflict between signalmodule.o and # sigcheck.o+intrcheck.o, we remove the latter two if we have the former. @@ -132,7 +125,7 @@ EXE= # This target is used by the master Makefile to link the final binary. link: $(MAINOBJ) $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \ - -L.. -lpython$(VERSION) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST) + $(LIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST) mv python$(EXE) ../python$(EXE) clean: @@ -230,15 +223,6 @@ sharedinstall: $(DESTSHARED) $(SHAREDMODS) fi; \ done -# Install a shared module from outside of setup -asharedinstall: $(DESTSHARED) $(ASHAREDMODULE)$(SO) - -for i in dummy $(ASHAREDMODULE)$(SO); do \ - if test -f $$i; then mv $$i $(DESTSHARED)/$$i; fi; done - -# This is handy when modules need to know where the destination directory is: -echodestshared: $(DESTSHARED) - echo $(DESTSHARED) - DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED) $(DESTSHARED): -- 2.40.0