makeile cleanups

1999-07-02 13:38:47 +00:00 · 1999-07-02 13:38:47 +00:00 · 9bc612bf52
--- a/caps/src/makefile.win
+++ b/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 \
--- a/dom/src/build/makefile.win
+++ b/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>
--- a/dom/src/jsurl/makefile.win
+++ b/dom/src/jsurl/makefile.win
@ -37,7 +37,6 @@ LCFLAGS		= $(LCFLAGS) -DDEBUG_GC

 LLIBS=  \
 	$(NULL)
-MISCDEP=$(LLIBS)
 OBJS=   \
 	.\$(OBJDIR)\jsurl.obj		\
 	$(NULL)
--- a/editor/base/makefile.win
+++ b/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
--- a/editor/txmgr/src/makefile.win
+++ b/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) \
--- a/editor/txmgr/tests/makefile.win
+++ b/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
-<<KEEP
-
 $(PROG1): $(OBJDIR) TestTXMgr.cpp

--- a/editor/txtsvc/src/makefile.win
+++ b/editor/txtsvc/src/makefile.win
@ -50,9 +50,6 @@ MAKE_OBJ_TYPE = DLL
 DLLNAME = txtsvc
 DLL=.\$(OBJDIR)\$(DLLNAME).dll

-MISCDEP =				\
- $(DIST)\lib\xpcom.lib
-
 LCFLAGS = \
        $(LCFLAGS) \
        $(DEFINES) \
--- a/extensions/cookie/makefile.win
+++ b/extensions/cookie/makefile.win
@ -56,7 +56,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 \
 $(DIST)\lib\xplib.lib		\
--- a/extensions/cookie/tests/makefile.win
+++ b/extensions/cookie/tests/makefile.win
@ -41,7 +41,6 @@ LLIBS=				\
 $(DIST)\lib\cookie.lib	\
 $(DIST)\lib\xpcom.lib	\
 $(DIST)\lib\netwerk.lib	\
- $(DIST)\lib\plc3.lib \
 $(LIBNSPR) \

 include <$(DEPTH)\config\rules.mak>
--- a/extensions/pics/src/makefile.win
+++ b/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
--- a/extensions/pics/tests/makefile.win
+++ b/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>
--- a/extensions/wallet/src/makefile.win
+++ b/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		\
--- a/gfx/src/windows/makefile.win
+++ b/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
--- a/gfx/tests/btest/makefile.win
+++ b/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)
--- a/gfx/tests/makefile.win
+++ b/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
--- a/htmlparser/robot/makefile.win
+++ b/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
--- a/htmlparser/src/makefile.win
+++ b/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			\
--- a/htmlparser/tests/grabpage/makefile.win
+++ b/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)
--- a/htmlparser/tests/logparse/makefile.win
+++ b/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)
--- a/parser/htmlparser/robot/makefile.win
+++ b/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
--- a/parser/htmlparser/src/makefile.win
+++ b/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			\
--- a/parser/htmlparser/tests/grabpage/makefile.win
+++ b/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)
--- a/parser/htmlparser/tests/logparse/makefile.win
+++ b/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)