From: Vadim Zeitlin Date: Mon, 4 Oct 1999 14:23:44 +0000 (+0000) Subject: attempt to fix makefile for make -j X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c5342938e2d03dc7a383c7693fe6059d13fb05b2 attempt to fix makefile for make -j git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 4f0d3c9da3..8905b1469a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 20:06, 1999/10/02 +# This file was automatically generated by tmake at 15:20, 1999/10/04 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -190,7 +190,6 @@ WX_HEADERS = \ gifdecod.h \ grid.h \ gsocket.h \ - dialup.h \ hash.h \ help.h \ helpbase.h \ @@ -839,7 +838,6 @@ GTK_GUIOBJS = \ gauge.o \ gdiobj.o \ gsockgtk.o \ - dialup.o \ icon.o \ listbox.o \ main.o \ @@ -1553,7 +1551,6 @@ MSW_GUIOBJS = \ gauge95.o \ gdiobj.o \ gsocket.o \ - dialup.o \ helpwin.o \ icon.o \ imaglist.o \ @@ -1640,7 +1637,6 @@ MSW_GUIDEPS = \ gauge95.d \ gdiobj.d \ gsocket.d \ - dialup.d \ helpwin.d \ icon.d \ imaglist.d \ @@ -1732,14 +1728,14 @@ HTMLDEPS = \ winpars.d UNIXOBJS = \ - gsocket.o \ dialup.o \ + gsocket.o \ threadpsx.o \ utilsunx.o UNIXDEPS = \ - gsocket.d \ dialup.d \ + gsocket.d \ threadpsx.d \ utilsunx.d @@ -1834,7 +1830,7 @@ DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS) HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ $(GENERIC_HEADERS) $(WX_HEADERS) -all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ +all: @WX_CREATE_LINKS@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @$(INSTALL) -d ./lib @@ -1845,7 +1841,7 @@ all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ @$(INSTALL) -d ./lib $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) -CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ +CREATE_LINKS: @WX_TARGET_LIBRARY@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ @$(RM) ./lib/@WX_LIBRARY_LINK2@ @$(RM) ./lib/@WX_LIBRARY_LINK3@ @@ -2301,6 +2297,6 @@ clean: $(RM) *.d $(RM) parser.c $(RM) lexer.c - $(RM) ./lib/*.a ./lib/*.so ./lib/*.sa + $(RM) ./lib/* cleanall: clean diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 11719f36d1..6e09796a45 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -484,7 +484,7 @@ DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS) HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ $(GENERIC_HEADERS) $(WX_HEADERS) -all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ +all: @WX_CREATE_LINKS@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @$(INSTALL) -d ./lib @@ -495,7 +495,7 @@ all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ @$(INSTALL) -d ./lib $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) -CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ +CREATE_LINKS: @WX_TARGET_LIBRARY@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ @$(RM) ./lib/@WX_LIBRARY_LINK2@ @$(RM) ./lib/@WX_LIBRARY_LINK3@