Commit in reactos on MAIN
loaders/dos/makefile+2-21.9 -> 1.10
ntoskrnl/Makefile+2-21.121 -> 1.122
rules.mak+3-21.88 -> 1.89
tools/depend.mk+1-11.15 -> 1.16
     /helper.mk+4-31.64 -> 1.65
+12-10
5 modified files
Changed the build system to treat nasm as a first-class citizen, making it produce output in the correct format (Microsoft COFF) and cleaning up some bit rot (unused makefile variables, different conventions from the rest of the build system, etc.)
reactos/loaders/dos
makefile 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- makefile	24 Nov 2003 16:44:10 -0000	1.9
+++ makefile	2 Jun 2004 18:24:08 -0000	1.10
@@ -1,4 +1,4 @@

-# $Id: makefile,v 1.9 2003/11/24 16:44:10 ekohl Exp $

+# $Id: makefile,v 1.10 2004/06/02 18:24:08 hyperion Exp $

 
 PATH_TO_TOP = ../..
 

@@ -7,7 +7,7 @@

 all: loadros.com
 
 loadros.com: loadros.asm

-	$(NASM_CMD) -fbin -o loadros.com loadros.asm

+	$(NASM) -fbin -o loadros.com loadros.asm

 
 clean:
 	- $(RM) loadros.com
reactos/ntoskrnl
Makefile 1.121 -> 1.122
diff -u -r1.121 -r1.122
--- Makefile	31 May 2004 23:37:22 -0000	1.121
+++ Makefile	2 Jun 2004 18:24:09 -0000	1.122
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.121 2004/05/31 23:37:22 gdalsnes Exp $

+# $Id: Makefile,v 1.122 2004/06/02 18:24:09 hyperion Exp $

 #
 # ReactOS Operating System
 #

@@ -744,7 +744,7 @@

 %.o: %.s
 	$(AS) $(ASFLAGS) -c $< -o $@
 %.o: %.asm

-	$(NASM_CMD) $(NFLAGS) $< -o $@

+	$(NASM) $(NFLAGS) $< -o $@

 %.coff: %.rc
 	$(RC) $(RCFLAGS) $< -o $@
reactos
rules.mak 1.88 -> 1.89
diff -u -r1.88 -r1.89
--- rules.mak	27 Mar 2004 06:23:37 -0000	1.88
+++ rules.mak	2 Jun 2004 18:24:09 -0000	1.89
@@ -28,7 +28,7 @@

 EXE_POSTFIX :=
 EXE_PREFIX := ./
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as

-NASM_CMD = nasm

+NASM = nasm

 DOSCLI =
 FLOPPY_DIR = /mnt/floppy
 SEP := /

@@ -41,7 +41,7 @@

 EXE_PREFIX :=
 EXE_POSTFIX := .exe
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as

-NASM_CMD = nasmw

+NASM = nasmw

 DOSCLI = yes
 FLOPPY_DIR = A:
 SEP := \$(EMPTY_VAR)

@@ -103,6 +103,7 @@

 STD_CPPFLAGS = $(STD_CFLAGS)
 STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86
 STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include

+STD_NFLAGS = -f win32

 
 # Developer Kits
 DK_PATH=$(PATH_TO_TOP)/dk
reactos/tools
depend.mk 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- depend.mk	2 Mar 2004 22:36:18 -0000	1.15
+++ depend.mk	2 Jun 2004 18:24:09 -0000	1.16
@@ -35,4 +35,4 @@

 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

-	$(NASM_CMD) $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@

+	$(NASM) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
reactos/tools
helper.mk 1.64 -> 1.65
diff -u -r1.64 -r1.65
--- helper.mk	29 May 2004 21:24:48 -0000	1.64
+++ helper.mk	2 Jun 2004 18:24:09 -0000	1.65
@@ -1,4 +1,4 @@

-# $Id: helper.mk,v 1.64 2004/05/29 21:24:48 hbirr Exp $

+# $Id: helper.mk,v 1.65 2004/06/02 18:24:09 hyperion Exp $

 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:

@@ -619,7 +619,7 @@

 
 TARGET_ASFLAGS += $(MK_ASFLAGS) $(STD_ASFLAGS)
 

-TARGET_NFLAGS += $(MK_NFLAGS)

+TARGET_NFLAGS += $(MK_NFLAGS) $(STD_NFLAGS)

 
 
 MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))

@@ -1057,7 +1057,7 @@

 %.o: %.s
 	$(AS) $(TARGET_ASFLAGS) -c $< -o $@
 %.o: %.asm

-	$(NASM_CMD) $(NFLAGS) $(TARGET_NFLAGS) $< -o $@

+	$(NASM) $(TARGET_NFLAGS) $< -o $@

 %.coff: %.rc
 	$(RC) $(TARGET_RCFLAGS) $< -o $@
 %.spec.def: %.spec

@@ -1071,5 +1071,6 @@

 
 # Compatibility
 CFLAGS := $(TARGET_CFLAGS)

+NFLAGS := $(TARGET_NFLAGS)

 
 # EOF
CVSspam 0.2.8