Fixed windows cvpack problem

1998-05-22 18:41:08 +00:00 · 1998-05-22 18:41:08 +00:00 · eb7c893d4f
--- a/layout/base/makefile.win
+++ b/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>
--- a/layout/base/public/makefile.win
+++ b/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>

--- a/layout/base/src/makefile.win
+++ b/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
--- a/layout/base/tests/makefile.win
+++ b/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
--- a/layout/build/makefile.win
+++ b/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
--- a/layout/html/base/makefile.win
+++ b/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>
--- a/layout/html/base/src/makefile.win
+++ b/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
--- a/layout/html/document/makefile.win
+++ b/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>
--- a/layout/html/document/src/makefile.win
+++ b/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
--- a/layout/html/forms/makefile.win
+++ b/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>
--- a/layout/html/forms/public/makefile.win
+++ b/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>

--- a/layout/html/forms/src/makefile.win
+++ b/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
--- a/layout/html/makefile.win
+++ b/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>
--- a/layout/html/style/makefile.win
+++ b/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>
--- a/layout/html/style/public/makefile.win
+++ b/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>

--- a/layout/html/style/src/makefile.win
+++ b/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
--- a/layout/html/table/makefile.win
+++ b/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>
--- a/layout/html/table/src/makefile.win
+++ b/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
--- a/layout/html/tests/makefile.win
+++ b/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
--- a/layout/makefile.win
+++ b/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>