diff --git a/reactos/Makefile b/reactos/Makefile index f26b858df35..52e6fdf2de0 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.216 2004/04/11 16:51:56 gvg Exp $ +# $Id: Makefile,v 1.217 2004/04/12 12:08:52 weiden Exp $ # # Global makefile # @@ -23,10 +23,6 @@ COMPONENTS = iface_native iface_additional hallib ntoskrnl # halx86 HALS = halx86 -# Bus drivers -# acpi isapnp pci -BUS = acpi isapnp pci - # Filesystem libraries # vfatlib LIB_FSLIB = vfatlib @@ -62,34 +58,6 @@ SERVERS = win32 # dos LOADERS = dos -# Driver support libraries -#bzip2 zlib -DRIVERS_LIB = bzip2 - -# Kernel mode device drivers -# Obsolete: ide -# beep blue floppy null parallel ramdrv serenum serial -DEVICE_DRIVERS = beep blue debugout floppy null serial bootvid - -# Kernel mode input drivers -INPUT_DRIVERS = keyboard mouclass psaux sermouse - -# Kernel mode file system drivers -# cdfs ext2 fs_rec ms np vfat -FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs - -# Kernel mode networking drivers -# afd ndis npf tcpip tdi wshtcpip -NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip - -# Kernel mode networking device drivers -# ne2000 pcnet -NET_DEVICE_DRIVERS = ne2000 pcnet - -# Kernel mode storage drivers -# atapi cdrom class2 disk scsiport -STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump - # System applications # autochk cmd format services setup usetup welcome winlogon SYS_APPS = autochk cmd explorer format services setup taskmgr userinit usetup welcome vmwinst winlogon regedit @@ -111,8 +79,7 @@ else EXT_MODULES = endif -KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \ - $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS +KERNEL_DRIVERS = drivers # Regression tests REGTESTS = regtests @@ -381,200 +348,25 @@ iface_additional_bootcd: # -# Bus driver rules +# Kernel Drivers rules # -$(BUS): %: - $(MAKE) -C drivers/bus/$* +$(KERNEL_DRIVERS): %: + $(MAKE) -C $* -$(BUS:%=%_implib): %_implib: - $(MAKE) -C drivers/bus/$* implib +$(KERNEL_DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib -$(BUS:%=%_clean): %_clean: - $(MAKE) -C drivers/bus/$* clean +$(KERNEL_DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean -$(BUS:%=%_install): %_install: - $(MAKE) -C drivers/bus/$* install +$(KERNEL_DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install -$(BUS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/bus/$* bootcd +$(KERNEL_DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd -.PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \ - $(BUS:%=%_install) $(BUS:%=%_bootcd) - - -# -# Driver support libraries rules -# -$(DRIVERS_LIB): %: - $(MAKE) -C drivers/lib/$* - -$(DRIVERS_LIB:%=%_implib): %_implib: - $(MAKE) -C drivers/lib/$* implib - -$(DRIVERS_LIB:%=%_clean): %_clean: - $(MAKE) -C drivers/lib/$* clean - -$(DRIVERS_LIB:%=%_install): %_install: - $(MAKE) -C drivers/lib/$* install - -$(DRIVERS_LIB:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/lib/$* bootcd - -.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \ - $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd) - - -# -# Device driver rules -# -$(DEVICE_DRIVERS): %: - $(MAKE) -C drivers/dd/$* - -$(DEVICE_DRIVERS:%=%_implib): %_implib: - $(MAKE) -C drivers/dd/$* implib - -$(DEVICE_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/dd/$* clean - -$(DEVICE_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/dd/$* install - -$(DEVICE_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/dd/$* bootcd - -.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \ - $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_bootcd) - - -# -# Video device driver rules -# -VIDEO_DRIVERS: - $(MAKE) -C drivers/video - -VIDEO_DRIVERS_implib: - $(MAKE) -C drivers/video implib - -VIDEO_DRIVERS_clean: - $(MAKE) -C drivers/video clean - -VIDEO_DRIVERS_install: - $(MAKE) -C drivers/video install - -VIDEO_DRIVERS_bootcd: - $(MAKE) -C drivers/video bootcd - -.PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_clean \ - VIDEO_DRIVERS_install VIDEO_DRIVERS_bootcd - - -# -# Input driver rules -# -$(INPUT_DRIVERS): %: - $(MAKE) -C drivers/input/$* - -$(INPUT_DRIVERS:%=%_implib): %_implib: - $(MAKE) -C drivers/input/$* implib - -$(INPUT_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/input/$* clean - -$(INPUT_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/input/$* install - -$(INPUT_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/input/$* bootcd - -.PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_clean)\ - $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_bootcd) - -# -# Filesystem driver rules -# -$(FS_DRIVERS): %: - $(MAKE) -C drivers/fs/$* - -$(FS_DRIVERS:%=%_implib): %_implib: - $(MAKE) -C drivers/fs/$* implib - -$(FS_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/fs/$* clean - -$(FS_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/fs/$* install - -$(FS_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/fs/$* bootcd - -.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \ - $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_bootcd) - - -# -# Network driver rules -# -$(NET_DRIVERS): %: - $(MAKE) -C drivers/net/$* - -$(NET_DRIVERS:%=%_implib): %_implib: - $(MAKE) -C drivers/net/$* implib - -$(NET_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/net/$* clean - -$(NET_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/net/$* install - -$(NET_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/net/$* bootcd - -.PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_clean) \ - $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_bootcd) - - -# -# Network device driver rules -# -$(NET_DEVICE_DRIVERS): %: - $(MAKE) -C drivers/net/dd/$* - -$(NET_DEVICE_DRIVERS:%=%_implib): %_implib: - $(MAKE) -C drivers/net/dd/$* implib - -$(NET_DEVICE_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/net/dd/$* clean - -$(NET_DEVICE_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/net/dd/$* install - -$(NET_DEVICE_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/net/dd/$* bootcd - -.PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \ - $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_bootcd) - - -# -# storage driver rules -# -$(STORAGE_DRIVERS): %: - $(MAKE) -C drivers/storage/$* - -$(STORAGE_DRIVERS:%=%_implib): %_implib: - $(MAKE) -C drivers/storage/$* implib - -$(STORAGE_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/storage/$* clean - -$(STORAGE_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/storage/$* install - -$(STORAGE_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/storage/$* bootcd - -.PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) $(STORAGE_DRIVERS:%=%_implib) \ - $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_bootcd) +.PHONY: $(KERNEL_DRIVERS) $(KERNEL_DRIVERS:%=%_implib) $(KERNEL_DRIVERS:%=%_clean) \ + $(KERNEL_DRIVERS:%=%_install) $(KERNEL_DRIVERS:%=%_bootcd) # diff --git a/reactos/drivers/Makefile b/reactos/drivers/Makefile index 68139b0aa41..aadb5c8ac80 100644 --- a/reactos/drivers/Makefile +++ b/reactos/drivers/Makefile @@ -1,13 +1,55 @@ -# $Id: Makefile,v 1.1 2003/12/06 23:10:50 mf Exp $ + # -# ReactOS drivers makefile to generate Doxygen documentation +# ReactOS control panels makefile # +PATH_TO_TOP = .. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = bus dd fs input lib net storage video + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) docu: doxygen Doxyfile -.PHONY: docu +.PHONY: all depends implib clean install bootcd docu +# +# Drivers +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + # EOF + diff --git a/reactos/drivers/bus/Makefile b/reactos/drivers/bus/Makefile new file mode 100644 index 00000000000..808ee461948 --- /dev/null +++ b/reactos/drivers/bus/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS BUS Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = acpi isapnp pci + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# BUS DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/dd/Makefile b/reactos/drivers/dd/Makefile new file mode 100644 index 00000000000..3c842adfa26 --- /dev/null +++ b/reactos/drivers/dd/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS Device Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = beep blue bootvid debugout floppy ide null serial + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# DEVICE DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/fs/Makefile b/reactos/drivers/fs/Makefile new file mode 100644 index 00000000000..c9295fd69fa --- /dev/null +++ b/reactos/drivers/fs/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS FileSystem Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = cdfs fs_rec ms mup np ntfs vfat + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# FILESYSTEM DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/input/Makefile b/reactos/drivers/input/Makefile new file mode 100644 index 00000000000..5e4fd073a87 --- /dev/null +++ b/reactos/drivers/input/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS Input Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = keyboard mouclass psaux sermouse + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# INPUT DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/lib/Makefile b/reactos/drivers/lib/Makefile new file mode 100644 index 00000000000..2da325d05f0 --- /dev/null +++ b/reactos/drivers/lib/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS Driver Support Libraries +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = bzip2 + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# DRIVER SUPPORT LIBRARIES +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/net/Makefile b/reactos/drivers/net/Makefile new file mode 100644 index 00000000000..ff76bd16d1e --- /dev/null +++ b/reactos/drivers/net/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS Networking Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = afd dd ndis npf tcpip tdi wshtcpip + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# NETWORKING DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/net/dd/Makefile b/reactos/drivers/net/dd/Makefile new file mode 100644 index 00000000000..45ea5047571 --- /dev/null +++ b/reactos/drivers/net/dd/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS Networking Device Drivers +# + +PATH_TO_TOP = ../../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = ne2000 pcnet + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# NETWORKING DEVICE DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF diff --git a/reactos/drivers/storage/Makefile b/reactos/drivers/storage/Makefile new file mode 100644 index 00000000000..11018f5ed4d --- /dev/null +++ b/reactos/drivers/storage/Makefile @@ -0,0 +1,50 @@ +# +# ReactOS Storage Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = atapi cdrom class2 disk diskdump scsiport + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# STORAGE DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF