From 72a83f69eee0c697fa3e315f16121f96aaa68801 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 24 Jul 2001 16:32:16 +0000 Subject: [PATCH] Updated makefile svn path=/trunk/; revision=2093 --- reactos/drivers/dd/null/.cvsignore | 1 + reactos/drivers/dd/null/makefile | 58 ++++++++--------------- reactos/drivers/dd/parallel/makefile | 52 ++++++--------------- reactos/drivers/fs/ext2/makefile | 29 +++++++----- reactos/drivers/fs/minix/Makefile | 18 ++++---- reactos/drivers/fs/ms/Makefile | 47 ++++--------------- reactos/drivers/fs/vfat/makefile | 69 +++++++++++++++++++++++----- 7 files changed, 128 insertions(+), 146 deletions(-) diff --git a/reactos/drivers/dd/null/.cvsignore b/reactos/drivers/dd/null/.cvsignore index f3e5bbde48b..03978ec3c34 100644 --- a/reactos/drivers/dd/null/.cvsignore +++ b/reactos/drivers/dd/null/.cvsignore @@ -1,5 +1,6 @@ null.coff null.sys +null.sys.unstripped base.tmp junk.tmp temp.exp diff --git a/reactos/drivers/dd/null/makefile b/reactos/drivers/dd/null/makefile index 94f2ff9f423..ce9ddf5186c 100644 --- a/reactos/drivers/dd/null/makefile +++ b/reactos/drivers/dd/null/makefile @@ -1,59 +1,37 @@ -# $Id: makefile,v 1.12 2001/07/15 21:18:58 rex Exp $ +# $Id: makefile,v 1.13 2001/07/24 16:27:01 ekohl Exp $ # # PATH_TO_TOP = ../../.. -TARGETNAME=null -OBJECTS= $(TARGETNAME).o $(TARGETNAME).coff ../../../ntoskrnl/ntoskrnl.a +TARGET = null -CFLAGS = -D__NTDRIVER__ -I../../../include +OBJECTS = $(TARGET).o $(TARGET).coff -all: $(TARGETNAME).sys +LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a + +CFLAGS = -D__NTDRIVER__ + +all: $(TARGET).sys $(TARGET).sys.unstripped .phony: all clean: - - $(RM) $(TARGETNAME).o $(TARGETNAME).coff junk.tmp base.tmp temp.exp $(TARGETNAME).sys + - $(RM) *.o *.sym $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean -install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys +install: $(FLOPPY_DIR)/drivers/$(TARGET).sys -$(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys - $(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys +$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys + $(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys -dist: ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys +dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys -../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys - $(CP) $(TARGETNAME).sys ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys +$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys + $(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys -$(TARGETNAME).sys: $(OBJECTS) - $(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 \ - $(OBJECTS) - - $(RM) junk.tmp - $(DLLTOOL) \ - --dllname $(TARGETNAME).sys \ - --base-file base.tmp \ - --output-exp temp.exp \ - --kill-at - - $(RM) base.tmp - $(CC) \ - --verbose \ - -Wl,--image-base,0x10000 \ - -Wl,-e,_DriverEntry@8 \ - -Wl,temp.exp \ - -specs=../../svc_specs \ - -mdll \ - -o $(TARGETNAME).sys \ - $(OBJECTS) - - $(RM) temp.exp +$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS) +$(TARGET).coff: $(PATH_TO_TOP)/include/reactos/buildno.h $(TARGET).rc -include ../../../rules.mak +include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/drivers/dd/parallel/makefile b/reactos/drivers/dd/parallel/makefile index 8e51eb24d69..9cc600f2d96 100644 --- a/reactos/drivers/dd/parallel/makefile +++ b/reactos/drivers/dd/parallel/makefile @@ -1,19 +1,22 @@ -# $Id: makefile,v 1.13 2001/07/15 21:18:58 rex Exp $ +# $Id: makefile,v 1.14 2001/07/24 16:27:41 ekohl Exp $ # # PATH_TO_TOP = ../../.. -TARGET=parallel -OBJECTS= $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a +TARGET = parallel -CFLAGS = -D__NTDRIVER__ -I. -I../../../include +OBJECTS = $(TARGET).o $(TARGET).coff -all: $(TARGET).sys +LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a + +CFLAGS = -D__NTDRIVER__ + +all: $(TARGET).sys $(TARGET).sys.unstripped .phony: all clean: - - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys + - $(RM) *.o *.sym $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean @@ -22,38 +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: $(OBJECTS) - $(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 \ - $(OBJECTS) - - $(RM) junk.tmp - $(DLLTOOL) \ - --dllname $(TARGET).sys \ - --base-file base.tmp \ - --output-exp temp.exp \ - --kill-at - - $(RM) base.tmp - $(CC) \ - --verbose \ - -Wl,--image-base,0x10000 \ - -Wl,-e,_DriverEntry@8 \ - -Wl,temp.exp \ - -specs=../../svc_specs \ - -mdll \ - -o $(TARGET).sys \ - $(OBJECTS) - - $(RM) temp.exp +$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS) +$(TARGET).coff: $(PATH_TO_TOP)/include/reactos/buildno.h $(TARGET).rc -include ../../../rules.mak +include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/drivers/fs/ext2/makefile b/reactos/drivers/fs/ext2/makefile index 46bcdbda496..9645697ab34 100644 --- a/reactos/drivers/fs/ext2/makefile +++ b/reactos/drivers/fs/ext2/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.12 2001/07/15 21:18:59 rex Exp $ +# $Id: makefile,v 1.13 2001/07/24 16:29:25 ekohl Exp $ # # Linux Ext2 IFS Driver # @@ -9,7 +9,7 @@ TARGETNAME=ext2fs OBJECTS = super.o blockdev.o inode.o file.o dir.o rw.o quota.o security.o \ attr.o ext2.coff -LIBS = ../../../ntoskrnl/ntoskrnl.a +LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a CFLAGS = -D__NTDRIVER__ -g -Wall @@ -24,13 +24,17 @@ clean: ext2fs.sys: $(OBJECTS) $(LIBS) $(CC) \ - -specs=../../svc_specs \ + -nostartfiles \ + -nostdlib \ + --subsystem=native \ -mdll \ - -o junk.tmp \ + --dll \ + -Wl,-e,_DriverEntry@8 \ + -Wl,--base-file,base.tmp \ -Wl,--defsym,_end=end \ -Wl,--defsym,_edata=__data_end__ \ -Wl,--defsym,_etext=etext \ - -Wl,--base-file,base.tmp \ + -o junk.tmp \ $(OBJECTS) $(LIBS) $(RM) junk.tmp $(DLLTOOL) \ @@ -39,18 +43,19 @@ ext2fs.sys: $(OBJECTS) $(LIBS) --output-exp temp.exp $(RM) base.tmp $(CC) \ - --verbose \ + -nostartfiles -nostdlib \ + --subsystem=native \ + -mdll \ + --dll \ -Wl,--image-base,0x10000 \ -Wl,-e,_DriverEntry \ - -specs=../../svc_specs \ - -mdll \ + -Wl,temp.exp \ -o $(TARGETNAME).sys \ - $(OBJECTS) $(LIBS) \ - -Wl,temp.exp + $(OBJECTS) $(LIBS) $(RM) temp.exp -ext2.coff: ../../../include/reactos/buildno.h ext2.rc +ext2.coff: $(PATH_TO_TOP)/include/reactos/buildno.h ext2.rc -include ../../../rules.mak +include $(PATH_TO_TOP)/rules.mak # EOF diff --git a/reactos/drivers/fs/minix/Makefile b/reactos/drivers/fs/minix/Makefile index e232a78d0b5..dae3028b58f 100644 --- a/reactos/drivers/fs/minix/Makefile +++ b/reactos/drivers/fs/minix/Makefile @@ -1,11 +1,13 @@ -# $Id: Makefile,v 1.6 2001/07/15 21:18:59 rex Exp $ +# $Id: Makefile,v 1.7 2001/07/24 16:30:36 ekohl Exp $ # # PATH_TO_TOP = ../../.. -TARGET=minixfs +TARGET = minixfs -OBJECTS = $(TARGET).o minix.coff ../../../ntoskrnl/ntoskrnl.a +OBJECTS = $(TARGET).o minix.coff + +LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a CFLAGS = -D__NTDRIVER__ -I. -g @@ -23,10 +25,10 @@ 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 MOBJECTS = block.o blockdev.o cache.o dir.o inode.o mount.o rw.o bitops.o @@ -35,7 +37,7 @@ minixfs.o: $(MOBJECTS) $(TARGET).sys: $(OBJECTS) minix.coff -minix.coff: ../../../include/reactos/buildno.h minix.rc +minix.coff: $(PATH_TO_TOP)/include/reactos/buildno.h minix.rc WITH_DEBUGGING=yes -include ../../../rules.mak +include $(PATH_TO_TOP)/rules.mak diff --git a/reactos/drivers/fs/ms/Makefile b/reactos/drivers/fs/ms/Makefile index 796c144996f..7f0ef75bf03 100644 --- a/reactos/drivers/fs/ms/Makefile +++ b/reactos/drivers/fs/ms/Makefile @@ -1,10 +1,10 @@ -# $Id: Makefile,v 1.4 2001/07/15 21:18:59 rex Exp $ +# $Id: Makefile,v 1.5 2001/07/24 16:31:17 ekohl Exp $ # # Mailslot File System # PATH_TO_TOP = ../../.. -TARGETNAME=msfs +TARGET = msfs OBJECTS = create.o finfo.o fsctrl.o msfs.o rw.o msfs.coff @@ -12,51 +12,24 @@ LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a CFLAGS = -D__NTDRIVER__ -all: $(TARGETNAME).sys +all: $(TARGET).sys $(TARGET).sys.unstripped .phony: all clean: - - $(RM) *.o $(TARGETNAME).sym $(TARGETNAME).sys + - $(RM) *.o *.sym $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean -$(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys - $(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys +$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys + $(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys -dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGETNAME).sys +dist: $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys -$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys - $(CP) $(TARGETNAME).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGETNAME).sys +$(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys + $(CP) $(TARGET).sys $(PATH_TO_TOP)/$(DIST_DIR)/drivers/$(TARGET).sys -$(TARGETNAME).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 \ - $(OBJECTS) $(LIBS) - $(RM) junk.tmp - $(DLLTOOL) \ - --dllname $(TARGETNAME).sys \ - --base-file base.tmp \ - --output-exp temp.exp \ - --kill-at - $(RM) base.tmp - $(CC) \ - --verbose \ - -Wl,--image-base,0x10000 \ - -Wl,-e,_DriverEntry@8 \ - -specs=../../svc_specs \ - -mdll \ - -o $(TARGETNAME).sys \ - $(OBJECTS) $(LIBS) \ - -Wl,temp.exp - $(RM) temp.exp - $(NM) --numeric-sort msfs.sys > msfs.sym +$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS) msfs.coff: $(PATH_TO_TOP)/include/reactos/buildno.h msfs.rc diff --git a/reactos/drivers/fs/vfat/makefile b/reactos/drivers/fs/vfat/makefile index 1ee6da7b45d..b71a014071a 100644 --- a/reactos/drivers/fs/vfat/makefile +++ b/reactos/drivers/fs/vfat/makefile @@ -1,9 +1,9 @@ -# $Id: makefile,v 1.33 2001/07/15 21:19:00 rex Exp $ +# $Id: makefile,v 1.34 2001/07/24 16:32:16 ekohl Exp $ # # PATH_TO_TOP = ../../.. -TARGET=vfatfs +TARGET = vfatfs OBJECTS = blockdev.o cleanup.o close.o create.o dir.o direntry.o dirwr.o \ fat.o fcb.o finfo.o iface.o rw.o shutdown.o string.o volume.o \ @@ -13,12 +13,12 @@ LIBS = $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a CFLAGS = -D__NTDRIVER__ -g -Wall -Werror -all: $(TARGET).sys.unstripped $(TARGET).sys +all: $(TARGET).sys $(TARGET).sys.unstripped .phony: all clean: - - $(RM) *.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 @@ -27,15 +27,28 @@ 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) $(LIBS) $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS) $(LD) -r -o vfat.o $(OBJECTS) - $(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" vfat.o $(LIBS) + $(CC) \ + -nostartfiles \ + -nostdlib \ + --subsystem=native \ + -mdll \ + --dll \ + -Wl,-e,_DriverEntry@8 \ + -Wl,--base-file,base.tmp \ + -Wl,--defsym,_end=end \ + -Wl,--defsym,_edata=__data_end__ \ + -Wl,--defsym,_etext=etext \ + vfat.o $(LIBS) \ + -o junk.tmp - $(RM) junk.tmp $(DLLTOOL) \ --dllname $(TARGET).sys \ @@ -43,7 +56,16 @@ $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS) --output-exp temp.exp \ --def vfatfs.def - $(RM) base.tmp - $(CC) -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).sys.unstripped vfat.o $(LIBS) + $(CC) \ + -nostartfiles -nostdlib \ + --subsystem=native \ + -mdll \ + --dll \ + -Wl,--image-base,0x10000 \ + -Wl,-e,_DriverEntry@8 \ + -Wl,temp.exp \ + -o $(TARGET).sys.unstripped \ + vfat.o $(LIBS) - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).sys.unstripped >$(TARGET).sym @@ -51,7 +73,19 @@ $(TARGET).sys.unstripped: $(OBJECTS) $(LIBS) $(TARGET).sys: $(OBJECTS) $(LIBS) $(LD) -r -o vfat.o $(OBJECTS) $(STRIP) --strip-debug vfat.o - $(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" vfat.o $(LIBS) + $(CC) \ + -nostartfiles \ + -nostdlib \ + --subsystem=native \ + -mdll \ + --dll \ + -Wl,-e,_DriverEntry@8 \ + -Wl,--base-file,base.tmp \ + -Wl,--defsym,_end=end \ + -Wl,--defsym,_edata=__data_end__ \ + -Wl,--defsym,_etext=etext \ + vfat.o $(LIBS) \ + -o junk.tmp - $(RM) junk.tmp $(DLLTOOL) \ --dllname $(TARGET).sys \ @@ -59,9 +93,20 @@ $(TARGET).sys: $(OBJECTS) $(LIBS) --output-exp temp.exp \ --def vfatfs.def - $(RM) base.tmp - $(CC) -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 -Wl,temp.exp -Wl,"-h vfatfs.sys" -specs=../../svc_specs -mdll -o $(TARGET).sys vfat.o $(LIBS) + $(CC) \ + -nostartfiles -nostdlib \ + --subsystem=native \ + -mdll \ + --dll \ + -Wl,--image-base,0x10000 \ + -Wl,-e,_DriverEntry@8 \ + -Wl,temp.exp \ + -o $(TARGET).sys \ + vfat.o $(LIBS) - $(RM) temp.exp +$(TARGET).coff: $(PATH_TO_TOP)/include/reactos/buildno.h vfatfs.rc + WITH_DEBUGGING=yes WARNINGS_ARE_ERRORS = yes -include ../../../rules.mak +include $(PATH_TO_TOP)/rules.mak