From 04d414f623311bc9ab3405ef73a845ea96df7dfb Mon Sep 17 00:00:00 2001 From: kipp Date: Fri, 22 May 1998 18:41:08 +0000 Subject: [PATCH] Fixed windows cvpack problem git-svn-id: svn://10.0.0.236/trunk@2199 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/makefile.win | 3 +-- mozilla/layout/base/public/makefile.win | 3 +-- mozilla/layout/base/src/makefile.win | 4 ++-- mozilla/layout/base/tests/makefile.win | 5 ++--- mozilla/layout/build/makefile.win | 3 +-- mozilla/layout/html/base/makefile.win | 3 +-- mozilla/layout/html/base/src/makefile.win | 3 +-- mozilla/layout/html/document/makefile.win | 3 +-- mozilla/layout/html/document/src/makefile.win | 3 +-- mozilla/layout/html/forms/makefile.win | 3 +-- mozilla/layout/html/forms/public/makefile.win | 3 +-- mozilla/layout/html/forms/src/makefile.win | 3 +-- mozilla/layout/html/makefile.win | 3 +-- mozilla/layout/html/style/makefile.win | 3 +-- mozilla/layout/html/style/public/makefile.win | 3 +-- mozilla/layout/html/style/src/makefile.win | 3 +-- mozilla/layout/html/table/makefile.win | 3 +-- mozilla/layout/html/table/src/makefile.win | 3 +-- mozilla/layout/html/tests/makefile.win | 4 ++-- mozilla/layout/makefile.win | 3 +-- 20 files changed, 23 insertions(+), 41 deletions(-) diff --git a/mozilla/layout/base/makefile.win b/mozilla/layout/base/makefile.win index c08fab64fd1..9526eb16178 100644 --- a/mozilla/layout/base/makefile.win +++ b/mozilla/layout/base/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 DIRS=public src tests -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/base/public/makefile.win b/mozilla/layout/base/public/makefile.win index f78dcd8853e..1092d632e18 100644 --- a/mozilla/layout/base/public/makefile.win +++ b/mozilla/layout/base/public/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 EXPORTS = \ nslayout.h \ @@ -43,5 +42,5 @@ EXPORTS = \ MODULE=raptor -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win index 21df35611b2..3b311f7261b 100644 --- a/mozilla/layout/base/src/makefile.win +++ b/mozilla/layout/base/src/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 LIBRARY_NAME=raptorlayout_s DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN @@ -73,10 +72,11 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: rm -f $(DIST)\lib\$(LIBRARY_NAME).lib + rm -f $(PDBFILE).pdb diff --git a/mozilla/layout/base/tests/makefile.win b/mozilla/layout/base/tests/makefile.win index 768a7008222..012d59a6eb3 100644 --- a/mozilla/layout/base/tests/makefile.win +++ b/mozilla/layout/base/tests/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestContainerFrame.exe @@ -33,7 +32,7 @@ LLIBS= \ $(LIBNSPR) \ $(DIST)\lib\libplc21.lib -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> install:: $(PROGRAMS) $(MAKE_INSTALL) $(PROG1) $(DIST)\bin @@ -49,7 +48,7 @@ install:: $(PROGRAMS) $(INCS) $(LLIBS) $(OS_LIBS) - -Fd$(PBDFILE) + -Fd.\$(OBJDIR)\$(*B) -Fe.\$(OBJDIR)\ -Fo.\$(OBJDIR)\ $(CURDIR)$(*B).cpp diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index 8e5e8689d68..53110091711 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 DEFINES=-D_IMPL_NS_HTML @@ -72,7 +71,7 @@ LLIBS= \ $(DIST)\lib\libplc21.lib \ $(LIBNSPR) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin diff --git a/mozilla/layout/html/base/makefile.win b/mozilla/layout/html/base/makefile.win index fd332714cf2..5620ead1bde 100644 --- a/mozilla/layout/html/base/makefile.win +++ b/mozilla/layout/html/base/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 DIRS=src -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win index a13ec4e672e..9e99c75cc15 100644 --- a/mozilla/layout/html/base/src/makefile.win +++ b/mozilla/layout/html/base/src/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlbase_s MODULE=raptor @@ -95,7 +94,7 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/layout/html/document/makefile.win b/mozilla/layout/html/document/makefile.win index d4bfe31b9cf..26d2a92d4ee 100644 --- a/mozilla/layout/html/document/makefile.win +++ b/mozilla/layout/html/document/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 DIRS=src -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index 966a65c300d..b5378d5d1ae 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmldoc_s MODULE=raptor @@ -43,7 +42,7 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/layout/html/forms/makefile.win b/mozilla/layout/html/forms/makefile.win index c9c67f325a1..f0ca52f8de3 100644 --- a/mozilla/layout/html/forms/makefile.win +++ b/mozilla/layout/html/forms/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 DIRS=public src -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/forms/public/makefile.win b/mozilla/layout/html/forms/public/makefile.win index 7508fed5452..bbb2ca9c645 100644 --- a/mozilla/layout/html/forms/public/makefile.win +++ b/mozilla/layout/html/forms/public/makefile.win @@ -16,11 +16,10 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 EXPORTS=nsIFormControl.h nsIFormManager.h MODULE=raptor -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index c3fc82093ef..3b1fac1e9d1 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlforms_s @@ -44,7 +43,7 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/layout/html/makefile.win b/mozilla/layout/html/makefile.win index 97d8ffb0509..03c818f0259 100644 --- a/mozilla/layout/html/makefile.win +++ b/mozilla/layout/html/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 DIRS = base document forms style table tests -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/style/makefile.win b/mozilla/layout/html/style/makefile.win index c9c67f325a1..f0ca52f8de3 100644 --- a/mozilla/layout/html/style/makefile.win +++ b/mozilla/layout/html/style/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 DIRS=public src -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/style/public/makefile.win b/mozilla/layout/html/style/public/makefile.win index 91188cd8315..dd40eb72b30 100644 --- a/mozilla/layout/html/style/public/makefile.win +++ b/mozilla/layout/html/style/public/makefile.win @@ -16,10 +16,9 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 EXPORTS=nsICSSParser.h MODULE=raptor -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win index 1ac8efb2b58..5842ef1aa4b 100644 --- a/mozilla/layout/html/style/src/makefile.win +++ b/mozilla/layout/html/style/src/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlstyle_s MODULE=raptor @@ -46,7 +45,7 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/layout/html/table/makefile.win b/mozilla/layout/html/table/makefile.win index d4bfe31b9cf..26d2a92d4ee 100644 --- a/mozilla/layout/html/table/makefile.win +++ b/mozilla/layout/html/table/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 DIRS=src -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win index d15ea4a7bcc..665effc9910 100644 --- a/mozilla/layout/html/table/src/makefile.win +++ b/mozilla/layout/html/table/src/makefile.win @@ -16,7 +16,6 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmltable_s MODULE=raptor @@ -53,7 +52,7 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win index 4c5d5876e54..7f20486f042 100644 --- a/mozilla/layout/html/tests/makefile.win +++ b/mozilla/layout/html/tests/makefile.win @@ -51,7 +51,7 @@ LLIBS= \ $(LIBNSPR) \ $(DIST)\lib\libplc21.lib -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak> install:: $(PROGRAMS) $(MAKE_INSTALL) $(PROG1) $(DIST)\bin @@ -79,7 +79,7 @@ clobber:: $(INCS) $(LLIBS) $(OS_LIBS) - -Fd$(PBDFILE) + -Fd.\$(OBJDIR)\$(CURDIR)$(*B) -Fe.\$(OBJDIR)\ -Fo.\$(OBJDIR)\ $(CURDIR)$(*B).cpp diff --git a/mozilla/layout/makefile.win b/mozilla/layout/makefile.win index 0e5c931a894..1f5f6acfbfe 100644 --- a/mozilla/layout/makefile.win +++ b/mozilla/layout/makefile.win @@ -16,8 +16,7 @@ # Reserved. DEPTH=.. -IGNORE_MANIFEST=1 DIRS=base html build -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\layout\config\rules.mak>