changes to support v15 release

svn path=/trunk/; revision=939

reactos/Makefile

@@ -250,15 +250,15 @@ endif
 
 clean_dist_dir:
 ifeq ($(DOSCLI),yes)
-	$(RM) $(DIST_DIR)\dlls\*.*
-	$(RM) $(DIST_DIR)\apps\*.*
-	$(RM) $(DIST_DIR)\drivers\*.*
-	$(RM) $(DIST_DIR)\subsys\*.*
-	$(RMDIR) $(DIST_DIR)\dlls
-	$(RMDIR) $(DIST_DIR)\apps
-	$(RMDIR) $(DIST_DIR)\drivers
-	$(RMDIR) $(DIST_DIR)\subsys
-	$(RMDIR) $(DIST_DIR)
+	- $(RM) $(DIST_DIR)\dlls\*.dll
+	- $(RM) $(DIST_DIR)\apps\*.exe
+	- $(RM) $(DIST_DIR)\drivers\*.sys
+	- $(RM) $(DIST_DIR)\subsys\*.exe
+	- $(RMDIR) $(DIST_DIR)\dlls
+	- $(RMDIR) $(DIST_DIR)\apps
+	- $(RMDIR) $(DIST_DIR)\drivers
+	- $(RMDIR) $(DIST_DIR)\subsys
+	- $(RMDIR) $(DIST_DIR)
 else
 	$(RM) -r $(DIST_DIR)
 endif

reactos/drivers/fs/vfat/makefile

@@ -1,10 +1,9 @@
-# $Id: makefile,v 1.13 1999/12/18 10:17:42 ea Exp $
+# $Id: makefile,v 1.14 2000/01/19 07:05:04 rex Exp $
 #
 #
 TARGET=vfatfs
 
-OBJECTS = blockdev.o dir.o dirwr.o iface.o string.o fat.o rw.o finfo.o \
-          volume.o create.o $(TARGET).coff
+OBJECTS = blockdev.o dir.o dirwr.o iface.o string.o fat.o rw.o finfo.o volume.o create.o $(TARGET).coff
 LIBS = ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
@@ -49,16 +48,7 @@ else
 endif
 
 $(TARGET).sys: $(OBJECTS) $(LIBS)
-	$(CC) \
-		-specs=../../svc_specs \
-		-mdll \
-		-o junk.tmp \
-		-Wl,--defsym,_end=end \
-		-Wl,--defsym,_edata=__data_end__ \
-		-Wl,--defsym,_etext=etext \
-		-Wl,--base-file,base.tmp \
-		-Wl,"-h vfatfs.sys" \
-		$(OBJECTS) $(LIBS)
+	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext -Wl,--base-file,base.tmp -Wl,"-h vfatfs.sys" $(OBJECTS) $(LIBS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
 		--dllname $(TARGET).sys \
@@ -66,16 +56,7 @@ $(TARGET).sys: $(OBJECTS) $(LIBS)
 		--output-exp temp.exp \
 		--def vfatfs.def
 	- $(RM) base.tmp
-	$(CC) \
-		--verbose \
-		-Wl,--image-base,0x10000 \
-		-Wl,-e,_DriverEntry@8 \
-		-Wl,temp.exp \
-		-Wl,"-h vfatfs.sys" \
-		-specs=../../svc_specs \
-		-mdll \
-		-o $(TARGET).sys \
-		$(OBJECTS) $(LIBS)
+	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).sys $(OBJECTS) $(LIBS)
 	- $(RM) temp.exp
 
 

reactos/include/reactos/version.h

@@ -1,4 +1,4 @@
-/* $Id: version.h,v 1.2 1999/11/12 12:01:09 dwelch Exp $
+/* $Id: version.h,v 1.3 2000/01/19 07:05:04 rex Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS kernel
@@ -16,11 +16,11 @@
 
 #define KERNEL_VERSION_MAJOR    	0
 #define KERNEL_VERSION_MINOR    	0
-#define KERNEL_VERSION_PATCH_LEVEL      14
+#define KERNEL_VERSION_PATCH_LEVEL      15
 /* Edit each time a new release is out: format is YYYYMMDD (UTC) */
-#define KERNEL_RELEASE_DATE		19990606L
+#define KERNEL_RELEASE_DATE		20000118L
 
-#define KERNEL_VERSION                  "0.0.14"
+#define KERNEL_VERSION                  "0.0.15"
 
 #endif
 

reactos/rules.mak

@@ -32,6 +32,7 @@ CP = copy
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
 NASM_CMD = nasm
 RM = del
+RMDIR = rmdir
 KM_SPECS = specs
 DOSCLI = yes
 FLOPPY_DIR = A: