From b8cfaa435ee8623bb18c818bcbf9997fb65f2d6b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 25 Jul 2001 06:21:38 +0000
Subject: [PATCH] Added missing .cvsignore files. Updated makefiles.

svn path=/trunk/; revision=2096
---
 reactos/drivers/dd/beep/makefile      | 20 +++++-----
 reactos/drivers/dd/blue/makefile      | 20 +++++-----
 reactos/drivers/dd/floppy/Makefile    | 18 +++++----
 reactos/drivers/dd/ide/makefile       | 18 +++++----
 reactos/drivers/dd/ramdrv/makefile    | 20 +++++-----
 reactos/drivers/dd/test/.cvsignore    |  3 +-
 reactos/drivers/dd/test/makefile      | 36 ++++++++++--------
 reactos/drivers/dd/vidport/.cvsignore |  1 +
 reactos/drivers/dd/vidport/makefile   | 55 ++++++++-------------------
 reactos/lib/ole32/.cvsignore          |  2 +
 reactos/lib/oleaut32/.cvsignore       |  2 +
 reactos/lib/shell32/.cvsignore        |  2 +
 12 files changed, 98 insertions(+), 99 deletions(-)
 create mode 100644 reactos/lib/ole32/.cvsignore
 create mode 100644 reactos/lib/oleaut32/.cvsignore
 create mode 100644 reactos/lib/shell32/.cvsignore

diff --git a/reactos/drivers/dd/beep/makefile b/reactos/drivers/dd/beep/makefile
index 5ff44fe3b89..55b213a9660 100644
--- a/reactos/drivers/dd/beep/makefile
+++ b/reactos/drivers/dd/beep/makefile
@@ -1,20 +1,22 @@
-# $Id: makefile,v 1.11 2001/07/15 21:18:57 rex Exp $
+# $Id: makefile,v 1.12 2001/07/25 06:19:24 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
 
 TARGET = beep
 
-CFLAGS = -D__NTDRIVER__ -I../../../include
+CFLAGS = -D__NTDRIVER__
 
-OBJECTS = beep.o beep.coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = beep.o beep.coff 
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
 all: $(TARGET).sys $(TARGET).sys.unstripped
 
 .PHONY: all
 
 clean:
-	- $(RM) beep.o beep.coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
+	- $(RM) *.o *.sym beep.coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: clean
 
@@ -23,12 +25,12 @@ install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS)
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
 
 WARNINGS_ARE_ERRORS = yes
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/drivers/dd/blue/makefile b/reactos/drivers/dd/blue/makefile
index 833a9a4cf0a..356e6500a4a 100644
--- a/reactos/drivers/dd/blue/makefile
+++ b/reactos/drivers/dd/blue/makefile
@@ -1,20 +1,22 @@
-# $Id: makefile,v 1.17 2001/07/15 21:18:57 rex Exp $
+# $Id: makefile,v 1.18 2001/07/25 06:19:34 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
 
 TARGET = blue
 
-CFLAGS = -D__NTDRIVER__ -I../../../include
+CFLAGS = -D__NTDRIVER__
 
-OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o $(TARGET).coff 
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
 all: $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: all
 
 clean:
-	- $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp blue.sys blue.sys.unstripped
+	- $(RM) *.o *.sym $(TARGET).coff junk.tmp base.tmp temp.exp blue.sys blue.sys.unstripped
 
 .phony: clean
 
@@ -23,12 +25,12 @@ install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS)
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
 
 WARNINGS_ARE_ERRORS = yes
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/drivers/dd/floppy/Makefile b/reactos/drivers/dd/floppy/Makefile
index 78b549a64c0..12d968d7624 100644
--- a/reactos/drivers/dd/floppy/Makefile
+++ b/reactos/drivers/dd/floppy/Makefile
@@ -1,11 +1,13 @@
-# $Id: Makefile,v 1.8 2001/07/15 21:18:57 rex Exp $
+# $Id: Makefile,v 1.9 2001/07/25 06:19:49 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
 
 TARGET=floppy
 
-OBJECTS = floppy.o isr.o dpc.o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = floppy.o isr.o dpc.o $(TARGET).coff
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
 CFLAGS = -D__NTDRIVER__ -I.
 
@@ -20,7 +22,7 @@ dpc.o: floppy.h
 .phony: all
 
 clean:
-	- $(RM) floppy.o isr.o dpc.o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
+	- $(RM) *.o *.sym $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: clean
 
@@ -29,12 +31,12 @@ install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).sys: $(OBJECTS)
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
 
 WITH_DEBUGGING=yes
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/drivers/dd/ide/makefile b/reactos/drivers/dd/ide/makefile
index 06803f5d393..3c88a81ff1d 100644
--- a/reactos/drivers/dd/ide/makefile
+++ b/reactos/drivers/dd/ide/makefile
@@ -1,11 +1,13 @@
-# $Id: makefile,v 1.23 2001/07/15 21:18:57 rex Exp $
+# $Id: makefile,v 1.24 2001/07/25 06:20:01 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
 
 TARGET=ide
 
-OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o $(TARGET).coff
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
 CFLAGS = -D__NTDRIVER__ -I. -g
 
@@ -14,7 +16,7 @@ all: $(TARGET).sys.unstripped $(TARGET).sys
 .phony: all
 
 clean:
-	- $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
+	- $(RM) *.o *.sym $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: clean
 
@@ -23,13 +25,13 @@ install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS)
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
 
 WITH_DEBUGGING=yes
 WARNINGS_ARE_ERRORS = yes
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/drivers/dd/ramdrv/makefile b/reactos/drivers/dd/ramdrv/makefile
index 3a9e0744458..115bf519d0b 100644
--- a/reactos/drivers/dd/ramdrv/makefile
+++ b/reactos/drivers/dd/ramdrv/makefile
@@ -1,11 +1,13 @@
-# $Id: makefile,v 1.3 2001/07/15 21:18:58 rex Exp $
+# $Id: makefile,v 1.4 2001/07/25 06:20:17 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
 
-TARGET=ramdrv
+TARGET = ramdrv
 
-OBJECTS = ramdrv.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = ramdrv.o
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
 CFLAGS = -D__NTDRIVER__ -I.
 
@@ -16,7 +18,7 @@ ramdrv.o: ramdrv.h
 .phony: all
 
 clean:
-	- $(RM) floppy.o junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
+	- $(RM) *.o *.sym *.coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: clean
 
@@ -25,12 +27,12 @@ install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).sys: $(OBJECTS)
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
 
 WITH_DEBUGGING=yes
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/drivers/dd/test/.cvsignore b/reactos/drivers/dd/test/.cvsignore
index ab5be07adb4..a6f277fd649 100644
--- a/reactos/drivers/dd/test/.cvsignore
+++ b/reactos/drivers/dd/test/.cvsignore
@@ -1,4 +1,5 @@
 base.tmp
 junk.tmp
 temp.exp
-
+test.coff
+test.sys.unstripped
diff --git a/reactos/drivers/dd/test/makefile b/reactos/drivers/dd/test/makefile
index 37bfdc8104e..6c3632978b3 100644
--- a/reactos/drivers/dd/test/makefile
+++ b/reactos/drivers/dd/test/makefile
@@ -3,27 +3,33 @@
 #
 PATH_TO_TOP = ../../..
 
-OBJECTS= test.o ../../../ntoskrnl/ntoskrnl.a
+TARGET = test
 
-all: test.sys
+OBJECTS = test.o
+
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
+
+CFLAGS =
+
+all: $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: all
 
 clean:
-	- $(RM) test.o test.a junk.tmp base.tmp temp.exp test.sys
+	- $(RM) *.o *.sym *.coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: clean
 
-test.sys: test.o
-	$(DLLTOOL) --dllname test.sys --output-lib test.a
-	$(CC) -specs=$(KM_SPECS) -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
-	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname test.sys --base-file base.tmp \
-	           --output-exp temp.exp 
-	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry -specs=$(KM_SPECS) \
-		-mdll -o test.sys $(OBJECTS) -Wl,temp.exp
-	- $(RM) temp.exp
+install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
+
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
+
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
+
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
+
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/drivers/dd/vidport/.cvsignore b/reactos/drivers/dd/vidport/.cvsignore
index a8493fd5a02..646942950c0 100644
--- a/reactos/drivers/dd/vidport/.cvsignore
+++ b/reactos/drivers/dd/vidport/.cvsignore
@@ -1 +1,2 @@
 vidport.coff
+vidport.sys.unstripped
diff --git a/reactos/drivers/dd/vidport/makefile b/reactos/drivers/dd/vidport/makefile
index b86a322e4c2..43cd517a427 100644
--- a/reactos/drivers/dd/vidport/makefile
+++ b/reactos/drivers/dd/vidport/makefile
@@ -1,20 +1,22 @@
-# $Id: makefile,v 1.12 2001/07/15 21:18:59 rex Exp $
+# $Id: makefile,v 1.13 2001/07/25 06:21:38 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
 
-TARGET=vidport
+TARGET = vidport
 
-OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o $(TARGET).coff
 
-CFLAGS = -D__NTDRIVER__ -I../../../include
+LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
 
-all: $(TARGET).sys vidport.a
+CFLAGS = -D__NTDRIVER__
+
+all: $(TARGET).sys $(TARGET).sys.unstripped vidport.a
 
 .phony: all
 
 clean:
-	- $(RM) $(TARGET).o $(TARGET).a $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys
+	- $(RM) *.o *.a *.sym $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped
 
 .phony: clean
 
@@ -23,45 +25,18 @@ install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
+	$(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys
 
-$(TARGET).sys: $(OBJECTS)
+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS)
+
+$(TARGET).a: $(TARGET).def
 	$(DLLTOOL) \
 		--dllname $(TARGET).sys \
 		--def $(TARGET).def \
 		--kill-at \
 		--output-lib $(TARGET).a
-	$(CC) \
-                $(OBJECTS) \
-                -Wl,-d -specs=../../svc_specs \
-                -mdll \
-                -o junk.tmp \
-                -Wl,--image-base,0x10000 \
-                -Wl,--defsym,_end=end \
-	        -Wl,--defsym,_edata=__data_end__ \
-                -Wl,--defsym,_etext=etext \
-	        -Wl,--base-file,base.tmp
-	- $(RM) junk.tmp
-	$(DLLTOOL) \
-                --dllname $(TARGET).sys \
-                --base-file base.tmp \
-	        --output-exp temp.exp \
-                --def $(TARGET).edf
-	- $(RM) base.tmp
-	$(CC) \
-                $(OBJECTS) \
-                -specs=../../svc_specs \
-                -mdll \
-                -o $(TARGET).sys \
-                -Wl,--image-base,0x10000 \
-                -Wl,-e,_DriverEntry@8 \
-                -Wl,--defsym,_end=end \
-	        -Wl,--defsym,_edata=__data_end__ \
-                -Wl,--defsym,_etext=etext \
-                -Wl,temp.exp 
-	- $(RM) temp.exp
 
-include ../../../rules.mak
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/lib/ole32/.cvsignore b/reactos/lib/ole32/.cvsignore
new file mode 100644
index 00000000000..5086e0e9cf4
--- /dev/null
+++ b/reactos/lib/ole32/.cvsignore
@@ -0,0 +1,2 @@
+ole32.coff
+ole32.dll
diff --git a/reactos/lib/oleaut32/.cvsignore b/reactos/lib/oleaut32/.cvsignore
new file mode 100644
index 00000000000..05f7a103468
--- /dev/null
+++ b/reactos/lib/oleaut32/.cvsignore
@@ -0,0 +1,2 @@
+oleaut32.coff
+oleaut32.dll
diff --git a/reactos/lib/shell32/.cvsignore b/reactos/lib/shell32/.cvsignore
new file mode 100644
index 00000000000..425ddafeb9e
--- /dev/null
+++ b/reactos/lib/shell32/.cvsignore
@@ -0,0 +1,2 @@
+shell32.coff
+shell32.dll