From 3eb825d6c1e9a8addf64c89e0da82f29fce7d29c Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Fri, 2 Jul 1999 13:40:18 +0000 Subject: [PATCH] makefile cleanups git-svn-id: svn://10.0.0.236/trunk@38042 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/local/tests/pop3/makefile.win | 1 - mozilla/mailnews/mime/cthandlers/calendar/makefile.win | 1 - mozilla/mailnews/mime/cthandlers/vcard/makefile.win | 1 - mozilla/mailnews/mime/emitters/build/makefile.win | 2 -- mozilla/mailnews/mime/emitters/html/makefile.win | 2 -- mozilla/mailnews/mime/emitters/raw/makefile.win | 2 -- mozilla/mailnews/mime/emitters/xml/makefile.win | 2 -- mozilla/mailnews/mime/src/makefile.win | 3 --- mozilla/mailnews/mime/tests/mimetest/makefile.win | 1 - mozilla/mailnews/news/build/makefile.win | 3 --- mozilla/mailnews/news/tests/newsParser/makefile.win | 1 - mozilla/mailnews/news/tests/nntp/makefile.win | 1 - mozilla/modules/libimg/gifcom/makefile.win | 3 --- mozilla/modules/libimg/jpgcom/makefile.win | 3 --- mozilla/modules/libimg/pngcom/makefile.win | 3 --- mozilla/modules/libimg/src/makefile.win | 2 -- mozilla/modules/libjar/makefile.win | 1 - mozilla/modules/libjar/standalone/makefile.win | 1 - mozilla/modules/libpref/src/makefile.win | 1 - mozilla/modules/libreg/src/makefile.win | 8 ++++---- mozilla/modules/oji/src/makefile.win | 1 - mozilla/modules/plugin/base/src/makefile.win | 1 - mozilla/modules/plugin/nglsrc/makefile.win | 1 - 23 files changed, 4 insertions(+), 41 deletions(-) diff --git a/mozilla/mailnews/local/tests/pop3/makefile.win b/mozilla/mailnews/local/tests/pop3/makefile.win index 3ac8bff3fb1..0f718146c1f 100644 --- a/mozilla/mailnews/local/tests/pop3/makefile.win +++ b/mozilla/mailnews/local/tests/pop3/makefile.win @@ -30,7 +30,6 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\rdf.lib \ $(DIST)\lib\msgbaseutil.lib \ $(DIST)\lib\xplib.lib \ diff --git a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win index 05bedd2c461..deec9cb6b30 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win @@ -89,7 +89,6 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\xpcom.lib \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win index 16c18087659..6e439744fec 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win @@ -94,7 +94,6 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xppref32.lib \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/mailnews/mime/emitters/build/makefile.win b/mozilla/mailnews/mime/emitters/build/makefile.win index 5af8ee9dc4a..fd00276b4bd 100644 --- a/mozilla/mailnews/mime/emitters/build/makefile.win +++ b/mozilla/mailnews/mime/emitters/build/makefile.win @@ -52,8 +52,6 @@ LLIBS= \ $(DIST)\lib\emitterutils_s.lib \ $(NULL) -MISCDEP=$(LLIBS) - include <$(DEPTH)\config\rules.mak> install:: $(DLL) diff --git a/mozilla/mailnews/mime/emitters/html/makefile.win b/mozilla/mailnews/mime/emitters/html/makefile.win index 508fc3ee6d3..9e05dc6caee 100644 --- a/mozilla/mailnews/mime/emitters/html/makefile.win +++ b/mozilla/mailnews/mime/emitters/html/makefile.win @@ -49,8 +49,6 @@ LLIBS= \ $(DIST)\lib\emitterutils_s.lib \ $(NULL) -MISCDEP=$(LLIBS) - include <$(DEPTH)\config\rules.mak> install:: $(DLL) diff --git a/mozilla/mailnews/mime/emitters/raw/makefile.win b/mozilla/mailnews/mime/emitters/raw/makefile.win index 1eff394336a..bce5f97acf0 100644 --- a/mozilla/mailnews/mime/emitters/raw/makefile.win +++ b/mozilla/mailnews/mime/emitters/raw/makefile.win @@ -39,8 +39,6 @@ LLIBS= \ $(DIST)\lib\emitterutils_s.lib \ $(NULL) -MISCDEP=$(LLIBS) - include <$(DEPTH)\config\rules.mak> install:: $(DLL) diff --git a/mozilla/mailnews/mime/emitters/xml/makefile.win b/mozilla/mailnews/mime/emitters/xml/makefile.win index 9770cbaba84..d7f5e9d6e31 100644 --- a/mozilla/mailnews/mime/emitters/xml/makefile.win +++ b/mozilla/mailnews/mime/emitters/xml/makefile.win @@ -47,8 +47,6 @@ LLIBS= \ $(DIST)\lib\emitterutils_s.lib \ $(NULL) -MISCDEP=$(LLIBS) - include <$(DEPTH)\config\rules.mak> install:: $(DLL) diff --git a/mozilla/mailnews/mime/src/makefile.win b/mozilla/mailnews/mime/src/makefile.win index 405aa6816ac..02ccf1bf139 100644 --- a/mozilla/mailnews/mime/src/makefile.win +++ b/mozilla/mailnews/mime/src/makefile.win @@ -116,13 +116,10 @@ OBJS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom.lib \ $(NULL) -MISCDEP=$(LLIBS) - include <$(DEPTH)/config/rules.mak> install:: $(DLL) diff --git a/mozilla/mailnews/mime/tests/mimetest/makefile.win b/mozilla/mailnews/mime/tests/mimetest/makefile.win index 060bc5fed19..8bbf4366d4e 100644 --- a/mozilla/mailnews/mime/tests/mimetest/makefile.win +++ b/mozilla/mailnews/mime/tests/mimetest/makefile.win @@ -33,7 +33,6 @@ LLIBS= \ $(DIST)\lib\rdf.lib \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\uconv.lib \ $(LIBNSPR) diff --git a/mozilla/mailnews/news/build/makefile.win b/mozilla/mailnews/news/build/makefile.win index 5fcc1652863..68310b62c1d 100644 --- a/mozilla/mailnews/news/build/makefile.win +++ b/mozilla/mailnews/news/build/makefile.win @@ -36,7 +36,6 @@ OBJS= \ LLIBS= \ $(MSGLIBS) \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\msgbaseutil.lib \ $(DIST)\lib\msgnews_s.lib \ $(DIST)\lib\netlib.lib \ @@ -44,8 +43,6 @@ LLIBS= \ $(DIST)\lib\rdfutil_s.lib \ $(NULL) -MISCDEP=$(LLIBS) - include <$(DEPTH)/config/rules.mak> install:: $(DLL) diff --git a/mozilla/mailnews/news/tests/newsParser/makefile.win b/mozilla/mailnews/news/tests/newsParser/makefile.win index 6616dc1e011..9efa0de431a 100644 --- a/mozilla/mailnews/news/tests/newsParser/makefile.win +++ b/mozilla/mailnews/news/tests/newsParser/makefile.win @@ -30,7 +30,6 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\msgnews_s.lib \ $(DIST)\lib\msgbase.lib \ $(DIST)\lib\msgbaseutil.lib \ diff --git a/mozilla/mailnews/news/tests/nntp/makefile.win b/mozilla/mailnews/news/tests/nntp/makefile.win index e3eda84650b..93e6c34acc6 100644 --- a/mozilla/mailnews/news/tests/nntp/makefile.win +++ b/mozilla/mailnews/news/tests/nntp/makefile.win @@ -30,7 +30,6 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\msgbase.lib \ $(DIST)\lib\msgbaseutil.lib \ $(DIST)\lib\xplib.lib \ diff --git a/mozilla/modules/libimg/gifcom/makefile.win b/mozilla/modules/libimg/gifcom/makefile.win index f28b0841014..faf2ee81814 100644 --- a/mozilla/modules/libimg/gifcom/makefile.win +++ b/mozilla/modules/libimg/gifcom/makefile.win @@ -44,7 +44,6 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC LCFLAGS = $(LCFLAGS) /TP LLIBS= $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\util.lib \ $(DIST)\lib\xpcom.lib \ !ifdef NU_CACHE @@ -52,8 +51,6 @@ LLIBS= $(LIBNSPR) \ !endif $(NULL) -MISCDEP=$(LLIBS) - LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib LIBRARY_SUFFIX = $(MOZ_BITS)$(VERSION_NUMBER) diff --git a/mozilla/modules/libimg/jpgcom/makefile.win b/mozilla/modules/libimg/jpgcom/makefile.win index 80686cbd580..28afe0ef2cd 100644 --- a/mozilla/modules/libimg/jpgcom/makefile.win +++ b/mozilla/modules/libimg/jpgcom/makefile.win @@ -44,7 +44,6 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC LCFLAGS = $(LCFLAGS) /TP LLIBS= $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\util.lib \ $(DIST)\lib\jpeg3250.lib \ $(DIST)\lib\xpcom.lib \ @@ -53,8 +52,6 @@ LLIBS= $(LIBNSPR) \ !endif $(NULL) -MISCDEP=$(LLIBS) - LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib LIBRARY_SUFFIX = $(MOZ_BITS)$(VERSION_NUMBER) diff --git a/mozilla/modules/libimg/pngcom/makefile.win b/mozilla/modules/libimg/pngcom/makefile.win index a582b6f72c8..bdd5f266eee 100644 --- a/mozilla/modules/libimg/pngcom/makefile.win +++ b/mozilla/modules/libimg/pngcom/makefile.win @@ -44,7 +44,6 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC LCFLAGS = $(LCFLAGS) /TP LLIBS= $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\util.lib \ $(DIST)\lib\png.lib \ $(DIST)\lib\xpcom.lib \ @@ -54,8 +53,6 @@ LLIBS= $(LIBNSPR) \ !endif $(NULL) -MISCDEP=$(LLIBS) - LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib LIBRARY_SUFFIX = $(MOZ_BITS)$(VERSION_NUMBER) diff --git a/mozilla/modules/libimg/src/makefile.win b/mozilla/modules/libimg/src/makefile.win index 2e82dc0f9e4..046b40b68ce 100644 --- a/mozilla/modules/libimg/src/makefile.win +++ b/mozilla/modules/libimg/src/makefile.win @@ -44,7 +44,6 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC LCFLAGS = $(LCFLAGS) /TP LLIBS= $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\util.lib \ $(DIST)\lib\xpcom.lib \ !ifdef NU_CACHE @@ -52,7 +51,6 @@ LLIBS= $(LIBNSPR) \ !endif $(NULL) -MISCDEP=$(LLIBS) #LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib diff --git a/mozilla/modules/libjar/makefile.win b/mozilla/modules/libjar/makefile.win index 5429fe509d8..6a0e923468e 100644 --- a/mozilla/modules/libjar/makefile.win +++ b/mozilla/modules/libjar/makefile.win @@ -56,7 +56,6 @@ LINCS= \ LLIBS= \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\zlib.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/modules/libjar/standalone/makefile.win b/mozilla/modules/libjar/standalone/makefile.win index 463c9b599b6..6fa39b0d5b2 100644 --- a/mozilla/modules/libjar/standalone/makefile.win +++ b/mozilla/modules/libjar/standalone/makefile.win @@ -44,7 +44,6 @@ LINCS= \ LLIBS= \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\zlib.lib \ $(DIST)\lib\xplib.lib \ $(NULL) diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index 62268232ebe..9cdbd1d9b49 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -78,7 +78,6 @@ HASHLIBS=$(BINREL_DIST)\lib\hash.lib $(BINREL_DIST)\lib\secutil.lib # DEFFILE = $(DLLNAME).def LLIBS = \ - $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/modules/libreg/src/makefile.win b/mozilla/modules/libreg/src/makefile.win index 1b98bd0a0f0..56e56a2200f 100644 --- a/mozilla/modules/libreg/src/makefile.win +++ b/mozilla/modules/libreg/src/makefile.win @@ -71,12 +71,12 @@ LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib #// #//------------------------------------------------------------------------ -LCFLAGS = $(LCFLAGS) -LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\plc3.lib - +LLIBS = \ + $(LIBNSPR) \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) -LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib + $(GLOWDIR)\glowcode.lib \ !endif + $(NULL) #// #// Win16 places ALL public header files in $(PUBLIC)/win16 diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win index ba7ca1995b9..fddf6ddfece 100644 --- a/mozilla/modules/oji/src/makefile.win +++ b/mozilla/modules/oji/src/makefile.win @@ -103,7 +103,6 @@ EXPORTS = jvmmgr.h \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\js3250.lib \ diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win index 3fc512d5a33..6d27621d6ba 100644 --- a/mozilla/modules/plugin/base/src/makefile.win +++ b/mozilla/modules/plugin/base/src/makefile.win @@ -71,7 +71,6 @@ CACHELIBNAME=netcache.lib LLIBS = \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ !ifdef NECKO $(DIST)\lib\neckoutil_s.lib \ !else diff --git a/mozilla/modules/plugin/nglsrc/makefile.win b/mozilla/modules/plugin/nglsrc/makefile.win index 3fc512d5a33..6d27621d6ba 100644 --- a/mozilla/modules/plugin/nglsrc/makefile.win +++ b/mozilla/modules/plugin/nglsrc/makefile.win @@ -71,7 +71,6 @@ CACHELIBNAME=netcache.lib LLIBS = \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\plc3.lib \ !ifdef NECKO $(DIST)\lib\neckoutil_s.lib \ !else