Commit 3dd264cc authored by Guido van Rossum's avatar Guido van Rossum

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).
parent 3f20592c
...@@ -106,13 +106,6 @@ REALLIBRARY= ../@REALLIBRARY@ ...@@ -106,13 +106,6 @@ REALLIBRARY= ../@REALLIBRARY@
all: $(OBJS) 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. # This target is used by the master Makefile to add the objects to the library.
# To deal with the conflict between signalmodule.o and # To deal with the conflict between signalmodule.o and
# sigcheck.o+intrcheck.o, we remove the latter two if we have the former. # sigcheck.o+intrcheck.o, we remove the latter two if we have the former.
...@@ -132,7 +125,7 @@ EXE= ...@@ -132,7 +125,7 @@ EXE=
# This target is used by the master Makefile to link the final binary. # This target is used by the master Makefile to link the final binary.
link: $(MAINOBJ) link: $(MAINOBJ)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(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) mv python$(EXE) ../python$(EXE)
clean: clean:
...@@ -230,15 +223,6 @@ sharedinstall: $(DESTSHARED) $(SHAREDMODS) ...@@ -230,15 +223,6 @@ sharedinstall: $(DESTSHARED) $(SHAREDMODS)
fi; \ fi; \
done 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) DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
$(DESTSHARED): $(DESTSHARED):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment