consolidated makefiles and added floppy and dist rules.

svn path=/trunk/; revision=564
This commit is contained in:
Rex Jolliff 1999-06-25 04:36:03 +00:00
parent 15714a3ea7
commit 19a76ae9af
26 changed files with 354 additions and 175 deletions

View file

@ -14,6 +14,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/apps/args.exe
$(FLOPPY_DIR)/apps/args.exe: args.exe
ifeq ($(DOSCLI),yes)
$(CP) args.exe $(FLOPPY_DIR)\apps\args.exe
else
$(CP) args.exe $(FLOPPY_DIR)/apps\args.exe
endif
args.exe: $(OBJECTS) $(LIBS) args.exe: $(OBJECTS) $(LIBS)
$(CC) $(OBJECTS) -o args.exe $(CC) $(OBJECTS) -o args.exe
$(NM) --numeric-sort args.exe > args.sym $(NM) --numeric-sort args.exe > args.sym

View file

@ -1,18 +1,32 @@
# #
# #
# #
BENCH_PROGS = bench-thread
all: bench-thread.exe all: $(BENCH_PROGS:%=%.exe)
.phony: all .phony: all
clean: clean: $(BENCH_PROGS:%=%_clean)
- $(RM) test-stdio.o
- $(RM) test-stdio.exe $(BENCH_PROGS:%=%_clean): %_clean:
- $(RM) test-stdio.sym - $(RM) $*.o
- $(RM) $*.exe
- $(RM) $*.sym
.phony: clean .phony: clean
floppy: # $(BENCH_PROGS:%=%_floppy)
$(BENCH_PROGS:%=%_floppy): %_floppy: $(FLOPPY_DIR)/apps/%.exe
$(BENCH_PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
ifeq ($(DOSCLI),yes)
$(CP) $*.exe $(FLOPPY_DIR)\apps\$*.exe
else
$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
endif
bench-thread.exe: bench-thread.c bench-thread.exe: bench-thread.c
$(CC) bench-thread.c -lkernel32 -o bench-thread.exe $(CC) bench-thread.c -lkernel32 -o bench-thread.exe
$(NM) --numeric-sort bench-thread.exe > bench-thread.sym $(NM) --numeric-sort bench-thread.exe > bench-thread.sym

View file

@ -14,6 +14,15 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.phony: clean $(CLEAN_FILES:%=%_clean) .phony: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/apps/hello.exe
$(FLOPPY_DIR)/apps/hello.exe: hello.exe
ifeq ($(DOSCLI),yes)
$(CP) hello.exe $(FLOPPY_DIR)\apps\hello.exe
else
$(CP) hello.exe $(FLOPPY_DIR)/apps\hello.exe
endif
hello.exe: $(OBJECTS) $(LIBS) hello.exe: $(OBJECTS) $(LIBS)
$(LD) $(OBJECTS) $(LIBS) -o hello.exe $(LD) $(OBJECTS) $(LIBS) -o hello.exe

View file

@ -1,19 +1,31 @@
# #
# #
# #
TEST_PROGS= test-stdio tst-printf tstdiomisc bug2 bug3 \
temptest test-fseek test_rdwr
all: test-stdio.exe tst-printf.exe tstdiomisc.exe bug2.exe bug3.exe \ all: $(TEST_PROGS:%=%.exe)
temptest.exe test-fseek.exe test_rdwr.exe
.phony: all .phony: all
clean: $(TEST_PROGS:%=%_clean): %_clean:
- $(RM) test-stdio.o - $(RM) $*.o
- $(RM) test-stdio.exe - $(RM) $*.exe
- $(RM) test-stdio.sym - $(RM) $*.sym
.phony: clean .phony: clean
floppy: # $(TEST_PROGS:%=%_floppy)
$(TEST_PROGS:%=%_floppy): %_floppy: $(FLOPPY_DIR)/apps/%.exe
$(TEST_PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
ifeq ($(DOSCLI),yes)
$(CP) $*.exe $(FLOPPY_DIR)\apps\$*.exe
else
$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
endif
bug2.exe: bug2.c bug2.exe: bug2.c
$(CC) bug2.c -lkernel32 -o bug2.exe $(CC) bug2.c -lkernel32 -o bug2.exe
$(NM) --numeric-sort bug2.exe > bug2.sym $(NM) --numeric-sort bug2.exe > bug2.sym

View file

@ -14,6 +14,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/apps/cat.exe
$(FLOPPY_DIR)/apps/cat.exe: cat.exe
ifeq ($(DOSCLI),yes)
$(CP) cat.exe $(FLOPPY_DIR)\apps\cat.exe
else
$(CP) cat.exe $(FLOPPY_DIR)/apps/cat.exe
endif
cat.exe: $(OBJECTS) $(LIBS) cat.exe: $(OBJECTS) $(LIBS)
$(CC) $(OBJECTS) -o cat.exe $(CC) $(OBJECTS) -o cat.exe
$(NM) --numeric-sort cat.exe > args.sym $(NM) --numeric-sort cat.exe > args.sym

View file

@ -14,6 +14,15 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.phony: clean $(CLEAN_FILES:%=%_clean) .phony: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/apps/shell.exe
$(FLOPPY_DIR)/apps/shell.exe: shell.exe
ifeq ($(DOSCLI),yes)
$(CP) shell.exe $(FLOPPY_DIR)\apps\shell.exe
else
$(CP) shell.exe $(FLOPPY_DIR)/apps/shell.exe
endif
shell.exe: $(OBJECTS) $(LIBS) shell.exe: $(OBJECTS) $(LIBS)
$(CC) -specs=../../specs $(OBJECTS) $(LIBS) -lgcc -o shell.exe $(CC) -specs=../../specs $(OBJECTS) $(LIBS) -lgcc -o shell.exe
$(NM) --numeric-sort shell.exe > shell.sym $(NM) --numeric-sort shell.exe > shell.sym

View file

@ -9,10 +9,10 @@ COPY /Y A:\APPS\*.EXE C:\reactos\system > NUL:
: :
: present a menu to the booter... : present a menu to the booter...
: :
ECHO 1) IDE,VFatFSD : ECHO 1) IDE,VFatFSD
ECHO 2) No Drivers : ECHO 2) No Drivers
CHOICE /C:123 /T:1,3 "Select kernel boot config" : CHOICE /C:123 /T:1,3 "Select kernel boot config"
IF ERRORLEVEL 2 GOTO :L2 : IF ERRORLEVEL 2 GOTO :L2
:L1 :L1
CLS CLS

View file

@ -17,6 +17,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/blue.sys
$(FLOPPY_DIR)/drivers/blue.sys: blue.sys
ifeq ($(DOSCLI),yes)
$(CP) blue.sys $(FLOPPY_DIR)\drivers\blue.sys
else
$(CP) blue.sys $(FLOPPY_DIR)/drviers/blue.sys
endif
blue.sys: $(OBJECTS) blue.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/ide.sys
$(FLOPPY_DIR)/ide.sys: ide.sys
ifeq ($(DOSCLI),yes)
$(CP) ide.sys $(FLOPPY_DIR)\ide.sys
else
$(CP) ide.sys $(FLOPPY_DIR)/ide.sys
endif
ide.sys: $(OBJECTS) ide.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/keyboard.sys
$(FLOPPY_DIR)/drivers/keyboard.sys: keyboard.sys
ifeq ($(DOSCLI),yes)
$(CP) keyboard.sys $(FLOPPY_DIR)\drivers\keyboard.sys
else
$(CP) keyboard.sys $(FLOPPY_DIR)/drviers/keyboard.sys
endif
keyboard.sys: $(OBJECTS) keyboard.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: # $(FLOPPY_DIR)/drivers/mouse.sys
$(FLOPPY_DIR)/drivers/mouse.sys: mouse.sys
ifeq ($(DOSCLI),yes)
$(CP) mouse.sys $(FLOPPY_DIR)\drivers\mouse.sys
else
$(CP) mouse.sys $(FLOPPY_DIR)/drviers/mouse.sys
endif
mouse.sys: $(OBJECTS) mouse.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/null.sys
$(FLOPPY_DIR)/drivers/null.sys: null.sys
ifeq ($(DOSCLI),yes)
$(CP) null.sys $(FLOPPY_DIR)\drivers\null.sys
else
$(CP) null.sys $(FLOPPY_DIR)/drviers/null.sys
endif
null.sys: $(OBJECTS) null.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/parallel.sys
$(FLOPPY_DIR)/drivers/parallel.sys: parallel.sys
ifeq ($(DOSCLI),yes)
$(CP) parallel.sys $(FLOPPY_DIR)\drivers\parallel.sys
else
$(CP) parallel.sys $(FLOPPY_DIR)/drviers/parallel.sys
endif
parallel.sys: $(OBJECTS) parallel.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/serial.sys
$(FLOPPY_DIR)/drivers/serial.sys: serial.sys
ifeq ($(DOSCLI),yes)
$(CP) serial.sys $(FLOPPY_DIR)\drivers\serial.sys
else
$(CP) serial.sys $(FLOPPY_DIR)/drviers/serial.sys
endif
serial.sys: $(OBJECTS) serial.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -16,6 +16,15 @@ clean:
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/vidport.sys
$(FLOPPY_DIR)/drivers/vidport.sys: vidport.sys
ifeq ($(DOSCLI),yes)
$(CP) vidport.sys $(FLOPPY_DIR)\drivers\vidport.sys
else
$(CP) vidport.sys $(FLOPPY_DIR)/drviers/vidport.sys
endif
vidport.sys: $(OBJECTS) vidport.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -23,6 +23,15 @@ endif
.phony: clean .phony: clean
floppy: $(FLOPPY_DIR)/drivers/vfatfsd.sys
$(FLOPPY_DIR)/drivers/vfatfsd.sys: vfatfsd.sys
ifeq ($(DOSCLI),yes)
$(CP) vfatfsd.sys $(FLOPPY_DIR)\vfatfsd.sys
else
$(CP) vfatfsd.sys $(FLOPPY_DIR)/vfatfsd.sys
endif
vfatfsd.sys: $(OBJECTS) vfatfsd.sys: $(OBJECTS)
$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \ $(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \ -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.30 1999/06/18 22:11:00 ea Exp $ # $Id: makefile,v 1.31 1999/06/25 04:35:45 rex Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -207,6 +207,15 @@ clean: $(CLEAN_FILES:%=%_clean)
$(CLEAN_FILES:%=%_clean): %_clean: $(CLEAN_FILES:%=%_clean): %_clean:
- $(RM) $* - $(RM) $*
floppy: $(FLOPPY_DIR)/dlls/crtdll.dll
$(FLOPPY_DIR)/dlls/crtdll.dll: crtdll.dll
ifeq ($(DOSCLI),yes)
$(CP) crtdll.dll $(FLOPPY_DIR)\dlls\crtdll.dll
else
$(CP) crtdll.dll $(FLOPPY_DIR)/dlls/crtdll.dll
endif
include ../../rules.mak include ../../rules.mak

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.3 1999/06/18 22:11:01 ea Exp $ # $Id: makefile,v 1.4 1999/06/25 04:35:47 rex Exp $
# #
# Makefile for fmifs.dll # Makefile for fmifs.dll
# #
@ -71,6 +71,15 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.PHONY: clean $(CLEAN_FILES:%=%_clean) .PHONY: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/dlls/fmifs.dll
$(FLOPPY_DIR)/dlls/fmifs.dll: fmifs.dll
ifeq ($(DOSCLI),yes)
$(CP) fmifs.dll $(FLOPPY_DIR)\dlls\fmifs.dll
else
$(CP) fmifs.dll $(FLOPPY_DIR)/dlls/fmifs.dll
endif
include ../../rules.mak include ../../rules.mak
# EOF # EOF

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.4 1999/06/18 22:11:02 ea Exp $ # $Id: makefile,v 1.5 1999/06/25 04:35:49 rex Exp $
# #
# Makefile for ReactOS gdi32.dll # Makefile for ReactOS gdi32.dll
# #
@ -73,6 +73,14 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.PHONY: clean $(CLEAN_FILES:%=%_clean) .PHONY: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/dlls/gdi32.dll
$(FLOPPY_DIR)/dlls/gdi32.dll: gdi32.dll
ifeq ($(DOSCLI),yes)
$(CP) gdi32.dll $(FLOPPY_DIR)\dlls\gdi32.dll
else
$(CP) gdi32.dll $(FLOPPY_DIR)/dlls/gdi32.dll
endif
include ../../rules.mak include ../../rules.mak

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.20 1999/06/18 22:11:03 ea Exp $ # $Id: makefile,v 1.21 1999/06/25 04:35:49 rex Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -134,5 +134,14 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.PHONY: clean $(CLEAN_FILES:%=%_clean) .PHONY: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/dlls/kernel32.dll
$(FLOPPY_DIR)/dlls/kernel32.dll: kernel32.dll
ifeq ($(DOSCLI),yes)
$(CP) kernel32.dll $(FLOPPY_DIR)\dlls\kernel32.dll
else
$(CP) kernel32.dll $(FLOPPY_DIR)/dlls/kernel32.dll
endif
#WARNINGS_ARE_ERRORS = yes #WARNINGS_ARE_ERRORS = yes
include ../../rules.mak include ../../rules.mak

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.16 1999/06/18 22:11:03 ea Exp $ # $Id: makefile,v 1.17 1999/06/25 04:35:50 rex Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -98,6 +98,15 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.PHONY: clean $(CLEAN_FILES:%=%_clean) .PHONY: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/dlls/ntdll.dll
$(FLOPPY_DIR)/dlls/ntdll.dll: ntdll.dll
ifeq ($(DOSCLI),yes)
$(CP) ntdll.dll $(FLOPPY_DIR)\dlls\ntdll.dll
else
$(CP) ntdll.dll $(FLOPPY_DIR)/dlls/ntdll.dll
endif
#WARNINGS_ARE_ERRORS = yes #WARNINGS_ARE_ERRORS = yes
include ../../rules.mak include ../../rules.mak

View file

@ -12,4 +12,14 @@ clean:
.PHONY: clean .PHONY: clean
floppy: $(FLOPPY_DIR)/loadros.com
$(FLOPPY_DIR)/loadros.com: loadros.com
ifeq ($(DOSCLI),yes)
$(CP) loadros.com $(FLOPPY_DIR)\loadros.com
else
$(CP) loadros.com $(FLOPPY_DIR)/loadros.com
endif
include ../../rules.mak include ../../rules.mak

View file

@ -1,141 +0,0 @@
#
# Global makefile
#
#
# Select your host
#
#HOST = mingw32-linux
#HOST = djgpp-msdos
HOST = mingw32-windows
include rules.mak
#
# Required to run the system
#
COMPONENTS = iface_native ntoskrnl
DLLS = ntdll kernel32 crtdll user32 fmifs gdi32
#DLLS = crtdll mingw32
SUBSYS = win32k
#
# Select the server(s) you want to build
#
SERVERS = win32
# SERVERS = posix linux os2
#
# Select the loader(s) you want to build
#
LOADERS = dos
# LOADERS = boot
#
# Select the device drivers and filesystems you want
#
DEVICE_DRIVERS = blue ide keyboard mouse null parallel serial vidport
# DEVICE_DRIVERS = beep event floppy ide_test sound test test1
FS_DRIVERS = vfat
# FS_DRIVERS = minix ext2 template
KERNEL_SERVICES = $(DEVICE_DRIVERS) $(FS_DRIVERS)
APPS = args hello shell test cat bench
# APPS = cmd
all: $(COMPONENTS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(APPS)
.PHONY: all
clean: $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \
$(KERNEL_SERVICES:%=%_clean) $(APPS:%=%_clean)
.PHONY: clean
#
# Applications
#
$(APPS): %:
make -C apps/$*
$(APPS:%=%_clean): %_clean:
make -C apps/$* clean
.PHONY: $(APPS) $(APPS:%=%_clean)
#
# Interfaces
#
iface_native:
make -C iface/native
iface_native_clean:
make -C iface/native clean
.PHONY: iface_native iface_native_clean
#
# Device driver rules
#
$(DEVICE_DRIVERS): %:
make -C services/dd/$*
$(DEVICE_DRIVERS:%=%_clean): %_clean:
make -C services/dd/$* clean
.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_clean)
$(FS_DRIVERS): %:
make -C services/fs/$*
$(FS_DRIVERS:%=%_clean): %_clean:
make -C services/fs/$* clean
.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_clean)
#
# Kernel loaders
#
$(LOADERS): %:
make -C loaders/$*
$(LOADERS:%=%_clean): %_clean:
make -C loaders/$* clean
.PHONY: $(LOADERS) $(LOADERS:%=%_clean)
#
# Required system components
#
ntoskrnl:
make -C ntoskrnl
ntoskrnl_clean:
make -C ntoskrnl clean
.PHONY: ntoskrnl ntoskrnl_clean
#
# Required DLLs
#
$(DLLS): %:
make -C lib/$*
$(DLLS:%=%_clean): %_clean:
make -C lib/$* clean
.PHONY: $(DLLS) $(DLLS:%=%_clean)
#
# Kernel Subsystems
#
$(SUBSYS): %:
make -C subsys/$*
$(SUBSYS:%=%_clean): %_clean:
make -C lib/$* clean
.PHONY: $(SUBSYS) $(SUBSYS:%=%_clean)

View file

@ -5,7 +5,7 @@
# #
# Select your host # Select your host
# #
HOST = mingw32-linux #HOST = mingw32-linux
#HOST = djgpp-msdos #HOST = djgpp-msdos
#HOST = mingw32-windows #HOST = mingw32-windows
@ -15,8 +15,8 @@ include rules.mak
# Required to run the system # Required to run the system
# #
COMPONENTS = iface_native ntoskrnl COMPONENTS = iface_native ntoskrnl
DLLS = ntdll kernel32 crtdll user32 fmifs gdi32 DLLS = ntdll kernel32 crtdll fmifs gdi32
#DLLS = advapi32 mingw32 #DLLS = advapi32 mingw32 user32
SUBSYS = win32k SUBSYS = win32k
# #
@ -50,6 +50,13 @@ clean: $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \
$(KERNEL_SERVICES:%=%_clean) $(APPS:%=%_clean) $(KERNEL_SERVICES:%=%_clean) $(APPS:%=%_clean)
.PHONY: clean .PHONY: clean
floppy: make_floppy_dirs autoexec_floppy $(COMPONENTS:%=%_floppy) \
$(DLLS:%=%_floppy) $(LOADERS:%=%_floppy) \
$(KERNEL_SERVICES:%=%_floppy) $(APPS:%=%_floppy)
dist: clean_dist_dir $(COMPONENTS:%=%_dist) $(DLLS:%=%_dist) \
$(LOADERS:%=%_dist) $(KERNEL_SERVICES:%=%_dist) $(APPS:%=%_dist)
# #
# Applications # Applications
# #
@ -59,7 +66,13 @@ $(APPS): %:
$(APPS:%=%_clean): %_clean: $(APPS:%=%_clean): %_clean:
make -C apps/$* clean make -C apps/$* clean
.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_floppy): %_floppy:
make -C apps/$* floppy
$(APPS:%=%_dist): %_dist:
make -C apps/$* dist
.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_floppy) $(APPS:%=%_dist)
# #
# Interfaces # Interfaces
@ -70,7 +83,12 @@ iface_native:
iface_native_clean: iface_native_clean:
make -C iface/native clean make -C iface/native clean
.PHONY: iface_native iface_native_clean iface_native_floppy:
iface_native_dist:
.PHONY: iface_native iface_native_clean iface_native_floppy \
iface_native_dist
# #
# Device driver rules # Device driver rules
@ -81,7 +99,14 @@ $(DEVICE_DRIVERS): %:
$(DEVICE_DRIVERS:%=%_clean): %_clean: $(DEVICE_DRIVERS:%=%_clean): %_clean:
make -C services/dd/$* clean make -C services/dd/$* clean
.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_clean) $(DEVICE_DRIVERS:%=%_floppy): %_floppy:
make -C services/dd/$* floppy
$(DEVICE_DRIVERS:%=%_dist): %_dist:
make -C services/dd/$* dist
.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_clean) \
$(DEVICE_DRIVERS:%=%_floppy) $(DEVICE_DRIVERS:%=%_dist)
$(FS_DRIVERS): %: $(FS_DRIVERS): %:
make -C services/fs/$* make -C services/fs/$*
@ -89,7 +114,14 @@ $(FS_DRIVERS): %:
$(FS_DRIVERS:%=%_clean): %_clean: $(FS_DRIVERS:%=%_clean): %_clean:
make -C services/fs/$* clean make -C services/fs/$* clean
.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_clean) $(FS_DRIVERS:%=%_floppy): %_floppy:
make -C services/fs/$* floppy
$(FS_DRIVERS:%=%_dist): %_dist:
make -C services/fs/$* dist
.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_clean) $(FS_DRIVERS:%=%_floppy) \
$(FS_DRIVERS:%=%_dist)
# #
# Kernel loaders # Kernel loaders
@ -101,7 +133,14 @@ $(LOADERS): %:
$(LOADERS:%=%_clean): %_clean: $(LOADERS:%=%_clean): %_clean:
make -C loaders/$* clean make -C loaders/$* clean
.PHONY: $(LOADERS) $(LOADERS:%=%_clean) $(LOADERS:%=%_floppy): %_floppy:
make -C loaders/$* floppy
$(LOADERS:%=%_dist): %_dist:
make -C loaders/$* dist
.PHONY: $(LOADERS) $(LOADERS:%=%_clean) $(LOADERS:%=%_floppy) \
$(LOADERS:%=%_dist)
# #
# Required system components # Required system components
@ -113,7 +152,13 @@ ntoskrnl:
ntoskrnl_clean: ntoskrnl_clean:
make -C ntoskrnl clean make -C ntoskrnl clean
.PHONY: ntoskrnl ntoskrnl_clean ntoskrnl_floppy:
make -C ntoskrnl floppy
ntoskrnl_dist:
make -C ntoskrnl dist
.PHONY: ntoskrnl ntoskrnl_clean ntoskrnl_floppy ntoskrnl_dist
# #
# Required DLLs # Required DLLs
@ -125,7 +170,13 @@ $(DLLS): %:
$(DLLS:%=%_clean): %_clean: $(DLLS:%=%_clean): %_clean:
make -C lib/$* clean make -C lib/$* clean
.PHONY: $(DLLS) $(DLLS:%=%_clean) $(DLLS:%=%_floppy): %_floppy:
make -C lib/$* floppy
$(DLLS:%=%_dist): %_dist:
make -C lib/$* dist
.PHONY: $(DLLS) $(DLLS:%=%_clean) $(DLLS:%=%_floppy) $(DLLS:%=%_dist)
# #
# Kernel Subsystems # Kernel Subsystems
@ -136,6 +187,67 @@ $(SUBSYS): %:
$(SUBSYS:%=%_clean): %_clean: $(SUBSYS:%=%_clean): %_clean:
make -C lib/$* clean make -C lib/$* clean
.PHONY: $(SUBSYS) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_floppy): %_floppy:
make -C lib/$* floppy
$(SUBSYS:%=%_dist): %_dist:
make -C lib/$* dist
.PHONY: $(SUBSYS) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_floppy) \
$(SUBSYS:%=%_dist)
#
# Make an install floppy
#
make_floppy_dirs:
ifeq ($(DOSCLI),yes)
mkdir $(FLOPPY_DIR)\dlls
mkdir $(FLOPPY_DIR)\apps
mkdir $(FLOPPY_DIR)\drivers
else
mkdir $(FLOPPY_DIR)/dlls $(FLOPPY_DIR)/apps $(FLOPPY_DIR)/drivers
endif
.PHONY: make_floppy_dirs
autoexec_floppy: $(FLOPPY_DIR)/autoexec.bat
$(FLOPPY_DIR)/autoexec.bat: bootflop.bat
ifeq ($(DOSCLI),yes)
$(CP) bootflop.bat $(FLOPPY_DIR)\autoexec.bat
else
$(CP) bootflop.bat $(FLOPPY_DIR)/autoexec.bat
endif
#
# Make a distribution saveset
#
clean_dist_dirs:
ifeq ($(DOSCLI),yes)
$(RM) $(DIST_DIR)\dlls\*.*
$(RM) $(DIST_DIR)\apps\*.*
$(RM) $(DIST_DIR)\drivers\*.*
$(RMDIR) $(DIST_DIR)\dlls
$(RMDIR) $(DIST_DIR)\apps
$(RMDIR) $(DIST_DIR)\drivers
$(RMDIR) $(DIST_DIR)
else
$(RM) -r $(DIST_DIR)
endif
make_dist_dirs:
ifeq ($(DOSCLI),yes)
mkdir $(DIST_DIR)
mkdir $(DIST_DIR)\dlls
mkdir $(DIST_DIR)\apps
mkdir $(DIST_DIR)\drivers
else
mkdir $(DIST_DIR) $(DIST_DIR)/dlls $(DIST_DIR)/apps $(DIST_DIR)/drivers
endif
.PHONY: clean_dist_dirs make_dist_dirs

View file

@ -1,4 +1,4 @@
# $Id: makefile_rex,v 1.25 1999/06/18 22:11:05 ea Exp $ # $Id: makefile_rex,v 1.26 1999/06/25 04:35:52 rex Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -185,6 +185,15 @@ $(CLEAN_FILES:%=%_clean): %_clean:
.PHONY: clean $(CLEAN_FILES:%=%_clean) .PHONY: clean $(CLEAN_FILES:%=%_clean)
floppy: $(FLOPPY_DIR)/ntoskrnl.exe
$(FLOPPY_DIR)/ntoskrnl.exe: ntoskrnl.exe
ifeq ($(DOSCLI),yes)
$(CP) ntoskrnl.exe $(FLOPPY_DIR)\ntoskrnl.exe
else
$(CP) ntoskrnl.exe $(FLOPPY_DIR)/ntoskrnl.exe
endif
ex/napi.o: ex/napi.c ../include/ntdll/napi.h ex/napi.o: ex/napi.c ../include/ntdll/napi.h
#WITH_DEBUGGING = yes #WITH_DEBUGGING = yes

View file

@ -18,6 +18,8 @@ CP = cp
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
NASM_CMD = nasm NASM_CMD = nasm
KM_SPECS = $(TOPDIR)/specs KM_SPECS = $(TOPDIR)/specs
FLOPPY_DIR = /a
DIST_DIR = $(TOPDIR)/dist
endif endif
ifeq ($(HOST),mingw32-windows) ifeq ($(HOST),mingw32-windows)
@ -30,8 +32,8 @@ NASM_CMD = nasm
RM = del RM = del
KM_SPECS = specs KM_SPECS = specs
DOSCLI = yes DOSCLI = yes
FLOPPY_DIR=A: FLOPPY_DIR = A:
DIST_DIR=dist DIST_DIR = $(TEMP)\dist
endif endif
# #