From 1008384826b8ed11b2cbd03b92449bbddef27a90 Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Fri, 2 Jul 1999 13:38:47 +0000 Subject: [PATCH] makeile cleanups git-svn-id: svn://10.0.0.236/trunk@38041 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/src/makefile.win | 1 - mozilla/dom/src/build/makefile.win | 21 ------------------- mozilla/dom/src/jsurl/makefile.win | 1 - mozilla/editor/base/makefile.win | 1 - mozilla/editor/txmgr/src/makefile.win | 3 --- mozilla/editor/txmgr/tests/makefile.win | 16 -------------- mozilla/editor/txtsvc/src/makefile.win | 3 --- mozilla/extensions/cookie/makefile.win | 1 - mozilla/extensions/cookie/tests/makefile.win | 1 - mozilla/extensions/pics/src/makefile.win | 1 - mozilla/extensions/pics/tests/makefile.win | 1 - mozilla/extensions/wallet/src/makefile.win | 1 - mozilla/gfx/src/windows/makefile.win | 4 ---- mozilla/gfx/tests/btest/makefile.win | 17 --------------- mozilla/gfx/tests/makefile.win | 19 +---------------- mozilla/htmlparser/robot/makefile.win | 1 - mozilla/htmlparser/src/makefile.win | 1 - .../htmlparser/tests/grabpage/makefile.win | 6 ------ .../htmlparser/tests/logparse/makefile.win | 5 ----- mozilla/parser/htmlparser/robot/makefile.win | 1 - mozilla/parser/htmlparser/src/makefile.win | 1 - .../htmlparser/tests/grabpage/makefile.win | 6 ------ .../htmlparser/tests/logparse/makefile.win | 5 ----- 23 files changed, 1 insertion(+), 116 deletions(-) diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win index 23e74d523d6..96b8479fef7 100755 --- a/mozilla/caps/src/makefile.win +++ b/mozilla/caps/src/makefile.win @@ -107,7 +107,6 @@ LINCS= $(LINCS) \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\zlib.lib \ diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win index 98c1ab99e16..0ff05a6511b 100644 --- a/mozilla/dom/src/build/makefile.win +++ b/mozilla/dom/src/build/makefile.win @@ -39,26 +39,6 @@ MAKE_OBJ_TYPE = DLL DLLNAME = jsdom DLL=.\$(OBJDIR)\$(DLLNAME).dll -MISCDEP = \ - $(DIST)\lib\jsdombase_s.lib \ - $(DIST)\lib\jsdomcore_s.lib \ - $(DIST)\lib\jsdomevents_s.lib \ - $(DIST)\lib\jsdomrange_s.lib \ - $(DIST)\lib\jsdomhtml_s.lib \ - $(DIST)\lib\jsdomcss_s.lib \ - $(DIST)\lib\jsurl.lib \ - $(DIST)\lib\raptorgfxwin.lib \ -!ifdef NECKO - $(DIST)\lib\neckoutil_s.lib \ -!else - $(DIST)\lib\netlib.lib \ -!endif - $(DIST)\lib\js32$(VERSION_NUMBER).lib \ - $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plds3.lib \ - $(DIST)\lib\plc3.lib \ - $(LIBNSPR) - LCFLAGS = \ $(LCFLAGS) \ $(DEFINES) \ @@ -82,7 +62,6 @@ LLIBS= \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\plds3.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/dom/src/jsurl/makefile.win b/mozilla/dom/src/jsurl/makefile.win index b1916dfdad3..7051ce4e1ff 100644 --- a/mozilla/dom/src/jsurl/makefile.win +++ b/mozilla/dom/src/jsurl/makefile.win @@ -37,7 +37,6 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC LLIBS= \ $(NULL) -MISCDEP=$(LLIBS) OBJS= \ .\$(OBJDIR)\jsurl.obj \ $(NULL) diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win index 89cc764eba8..c1fc006dbce 100644 --- a/mozilla/editor/base/makefile.win +++ b/mozilla/editor/base/makefile.win @@ -130,7 +130,6 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\raptorwidget_s.lib \ !ifdef NECKO diff --git a/mozilla/editor/txmgr/src/makefile.win b/mozilla/editor/txmgr/src/makefile.win index 3169554ba8a..b276e839d40 100644 --- a/mozilla/editor/txmgr/src/makefile.win +++ b/mozilla/editor/txmgr/src/makefile.win @@ -47,9 +47,6 @@ MAKE_OBJ_TYPE = DLL DLLNAME = txmgr DLL=.\$(OBJDIR)\$(DLLNAME).dll -MISCDEP = \ - $(DIST)\lib\xpcom.lib - LCFLAGS = \ $(LCFLAGS) \ $(DEFINES) \ diff --git a/mozilla/editor/txmgr/tests/makefile.win b/mozilla/editor/txmgr/tests/makefile.win index d93d7bbd99f..15f679a3c14 100644 --- a/mozilla/editor/txmgr/tests/makefile.win +++ b/mozilla/editor/txmgr/tests/makefile.win @@ -47,21 +47,5 @@ install:: $(PROGRAMS) clobber:: -for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p -# Move this into config/obj.inc when it's allowed -.cpp{.\$(OBJDIR)\}.exe: - $(CC) @<<$(CFGFILE) - $(CFLAGS) - $(LCFLAGS) - $(LINCS) - $(LINCS_1) - $(INCS) - $(LLIBS) - $(OS_LIBS) - -Fd$(PDBFILE) - -Fe.\$(OBJDIR)\ - -Fo.\$(OBJDIR)\ - $(CURDIR)$(*B).cpp -< diff --git a/mozilla/extensions/pics/src/makefile.win b/mozilla/extensions/pics/src/makefile.win index 42a7e8444b9..ec70cf6d2ad 100644 --- a/mozilla/extensions/pics/src/makefile.win +++ b/mozilla/extensions/pics/src/makefile.win @@ -74,7 +74,6 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS = \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \ !ifdef NECKO diff --git a/mozilla/extensions/pics/tests/makefile.win b/mozilla/extensions/pics/tests/makefile.win index 22028b038dd..65a143e7148 100644 --- a/mozilla/extensions/pics/tests/makefile.win +++ b/mozilla/extensions/pics/tests/makefile.win @@ -46,7 +46,6 @@ LINCS = -I$(PUBLIC)/js \ LLIBS= \ $(DIST)\lib\pics.lib \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/extensions/wallet/src/makefile.win b/mozilla/extensions/wallet/src/makefile.win index 1665e0ecf00..6d48eeb5688 100644 --- a/mozilla/extensions/wallet/src/makefile.win +++ b/mozilla/extensions/wallet/src/makefile.win @@ -40,7 +40,6 @@ EXPORTS= $(NULL) LLIBS=$(LLIBS) $(LIBNSPR) \ $(WALLETLIBS) \ $(DIST)\lib\secfreenav32.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\xppref32.lib \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\xplib.lib \ diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win index 3961f8dec70..236231c4cd5 100644 --- a/mozilla/gfx/src/windows/makefile.win +++ b/mozilla/gfx/src/windows/makefile.win @@ -31,9 +31,6 @@ DEFINES=-D_IMPL_NS_GFX -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT DEFINES=$(DEFINES) -DNGLAYOUT_DDRAW !endif -MISCDEP= \ - $(DIST)\lib\raptorgfx_s.lib - OBJS = \ .\$(OBJDIR)\nsDeviceContextWin.obj \ .\$(OBJDIR)\nsDrawingSurfaceWin.obj \ @@ -75,7 +72,6 @@ LLIBS= \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ - $(DIST)\lib\plc3.lib \ !ifdef NECKO $(DIST)\lib\neckoutil_s.lib \ !else diff --git a/mozilla/gfx/tests/btest/makefile.win b/mozilla/gfx/tests/btest/makefile.win index 4a2b575f6b5..90b8671b46d 100644 --- a/mozilla/gfx/tests/btest/makefile.win +++ b/mozilla/gfx/tests/btest/makefile.win @@ -28,7 +28,6 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ $(RESFILE) @@ -43,20 +42,4 @@ install:: $(PROGRAMS) clobber:: rm -f $(DIST)\bin\BitTest.exe -# Move this into config/obj.inc when it's allowed -.cpp{.\$(OBJDIR)\}.exe: - $(CC) @<<$(CFGFILE) - $(CFLAGS) - $(LCFLAGS) - $(LINCS) - $(LINCS_1) - $(INCS) - $(LLIBS) - $(OS_LIBS) - -Fd.\$(OBJDIR)\ - -Fe.\$(OBJDIR)\ - -Fo.\$(OBJDIR)\ - $(CURDIR)$(*B).cpp -<< - $(PROG0): $(OBJDIR) BitTest.cpp $(RESFILE) diff --git a/mozilla/gfx/tests/makefile.win b/mozilla/gfx/tests/makefile.win index b85dab88a34..eb4bc007d7a 100644 --- a/mozilla/gfx/tests/makefile.win +++ b/mozilla/gfx/tests/makefile.win @@ -31,8 +31,7 @@ LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) \ - $(DIST)\lib\plc3.lib + $(LIBNSPR) include <$(DEPTH)\config\rules.mak> @@ -46,22 +45,6 @@ clobber:: rm -f $(DIST)\bin\TestColorNames.exe rm -f $(DIST)\bin\DumpColors.exe -# Move this into config/obj.inc when it's allowed -.cpp{.\$(OBJDIR)\}.exe: - $(CC) @<<$(CFGFILE) - $(CFLAGS) - $(LCFLAGS) - $(LINCS) - $(LINCS_1) - $(INCS) - $(LLIBS) - $(OS_LIBS) - -Fd.\$(OBJDIR)\ - -Fe.\$(OBJDIR)\ - -Fo.\$(OBJDIR)\ - $(CURDIR)$(*B).cpp -<< - $(PROG1): $(OBJDIR) TestRect.cpp $(PROG2): $(OBJDIR) TestColorNames.cpp diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win index bf3208f4153..bea72dec14f 100644 --- a/mozilla/htmlparser/robot/makefile.win +++ b/mozilla/htmlparser/robot/makefile.win @@ -25,7 +25,6 @@ LLIBS= \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ !ifndef NECKO $(DIST)\lib\netlib.lib \ !endif diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index 201863dcb80..b026e6fe897 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -144,7 +144,6 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\expat.lib \ !ifdef NECKO $(DIST)\lib\neckoutil_s.lib \ diff --git a/mozilla/htmlparser/tests/grabpage/makefile.win b/mozilla/htmlparser/tests/grabpage/makefile.win index 11f6cb0edd1..d2a782d08d1 100644 --- a/mozilla/htmlparser/tests/grabpage/makefile.win +++ b/mozilla/htmlparser/tests/grabpage/makefile.win @@ -21,12 +21,6 @@ IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = EXE PROGRAM = .\$(OBJDIR)\grabpage.exe -MISCDEP= \ - $(DIST)\lib\raptorhtmlpars.lib \ - $(DIST)\lib\netlib.lib \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) - OBJS = \ .\$(OBJDIR)\grabpage.obj \ $(NULL) diff --git a/mozilla/htmlparser/tests/logparse/makefile.win b/mozilla/htmlparser/tests/logparse/makefile.win index bfe785714fb..f379096c8a1 100644 --- a/mozilla/htmlparser/tests/logparse/makefile.win +++ b/mozilla/htmlparser/tests/logparse/makefile.win @@ -21,11 +21,6 @@ IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = EXE PROGRAM = .\$(OBJDIR)\logparse.exe -MISCDEP= \ - $(DIST)\lib\raptorhtmlpars.lib \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) - OBJS = \ .\$(OBJDIR)\logparse.obj \ $(NULL) diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win index bf3208f4153..bea72dec14f 100644 --- a/mozilla/parser/htmlparser/robot/makefile.win +++ b/mozilla/parser/htmlparser/robot/makefile.win @@ -25,7 +25,6 @@ LLIBS= \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ !ifndef NECKO $(DIST)\lib\netlib.lib \ !endif diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index 201863dcb80..b026e6fe897 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -144,7 +144,6 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\expat.lib \ !ifdef NECKO $(DIST)\lib\neckoutil_s.lib \ diff --git a/mozilla/parser/htmlparser/tests/grabpage/makefile.win b/mozilla/parser/htmlparser/tests/grabpage/makefile.win index 11f6cb0edd1..d2a782d08d1 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/makefile.win +++ b/mozilla/parser/htmlparser/tests/grabpage/makefile.win @@ -21,12 +21,6 @@ IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = EXE PROGRAM = .\$(OBJDIR)\grabpage.exe -MISCDEP= \ - $(DIST)\lib\raptorhtmlpars.lib \ - $(DIST)\lib\netlib.lib \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) - OBJS = \ .\$(OBJDIR)\grabpage.obj \ $(NULL) diff --git a/mozilla/parser/htmlparser/tests/logparse/makefile.win b/mozilla/parser/htmlparser/tests/logparse/makefile.win index bfe785714fb..f379096c8a1 100644 --- a/mozilla/parser/htmlparser/tests/logparse/makefile.win +++ b/mozilla/parser/htmlparser/tests/logparse/makefile.win @@ -21,11 +21,6 @@ IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = EXE PROGRAM = .\$(OBJDIR)\logparse.exe -MISCDEP= \ - $(DIST)\lib\raptorhtmlpars.lib \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) - OBJS = \ .\$(OBJDIR)\logparse.obj \ $(NULL)