Full memory management support (memory.c & memory.h & mem.S)

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index d3e3daf..60dbf5e 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -16,7 +16,9 @@ include rules.mak
 # Required to run the system
 #
 COMPONENTS = iface_native iface_additional ntoskrnl
-DLLS = ntdll kernel32 crtdll advapi32 fmifs gdi32 secur32 user32 ws2_32 msafd msvcrt
+BUS = acpi isapnp
+DLLS = ntdll kernel32 crtdll advapi32 fmifs gdi32 secur32 user32 ws2_32 \
+       msafd msvcrt shell32
 SUBSYS = smss win32k csrss
 
 #
@@ -38,10 +40,10 @@ LOADERS = dos
 DEVICE_DRIVERS = vidport vga blue ide null floppy
 
 #INPUT_DRIVERS = keyboard
-INPUT_DRIVERS = keyboard
+INPUT_DRIVERS = keyboard mouclass psaux
 
 #FS_DRIVERS = vfat minix ext2 template
-FS_DRIVERS = vfat
+FS_DRIVERS = vfat ms np
 
 #NET_DRIVERS = ndis tdi tcpip tditest wshtcpip afd
 NET_DRIVERS = ndis tcpip tditest wshtcpip afd
@@ -56,22 +58,22 @@ NET_DEVICE_DRIVERS = ne2000
 SYS_APPS = shell winlogon services
 
 APPS = args hello test cat bench apc shm lpc thread event file gditest \
-       pteb consume dump_shared_data vmtest regtest
+       pteb consume dump_shared_data vmtest regtest alive mstest nptest \
+       objdir atomtest
 
-#       objdir
-
-#NET_APPS = ping roshttpd
+#NET_APPS = ping roshttpd telnet
 NET_APPS = ping
 
 
 KERNEL_SERVICES = $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) $(NET_DRIVERS) $(NET_DEVICE_DRIVERS)
 
-all: buildno $(COMPONENTS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(SYS_APPS) $(APPS) $(NET_APPS)
+all: buildno $(COMPONENTS) $(BUS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(SYS_APPS) $(APPS) $(NET_APPS)
 
 .PHONY: all
 
-clean: buildno_clean $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \
-       $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(APPS:%=%_clean)
+clean: buildno_clean $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(DLLS:%=%_clean) \
+       $(LOADERS:%=%_clean) $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) \
+       $(SYS_APPS:%=%_clean) $(APPS:%=%_clean) $(NET_APPS:%=%_clean)
 
 .PHONY: clean
 
@@ -94,14 +96,16 @@ rmkdir$(EXE_POSTFIX): rmkdir.c
 endif
 
 
-install: rcopy$(EXE_POSTFIX) rmkdir$(EXE_POSTFIX) make_install_dirs autoexec_install $(COMPONENTS:%=%_install) \
+install: rcopy$(EXE_POSTFIX) rmkdir$(EXE_POSTFIX) make_install_dirs autoexec_install \
+        $(COMPONENTS:%=%_install) $(BUS:%=%_install) \
         $(DLLS:%=%_install) $(LOADERS:%=%_install) \
         $(KERNEL_SERVICES:%=%_install) $(SUBSYS:%=%_install) \
         $(SYS_APPS:%=%_install) $(APPS:%=%_install)
 
-dist: rcopy$(EXE_POSTFIX) clean_dist_dir make_dist_dirs $(COMPONENTS:%=%_dist) $(DLLS:%=%_dist) \
+dist: rcopy$(EXE_POSTFIX) clean_dist_dir make_dist_dirs $(COMPONENTS:%=%_dist) \
+      $(BUS:%=%_dist) $(DLLS:%=%_dist) \
       $(LOADERS:%=%_dist) $(KERNEL_SERVICES:%=%_dist) $(SUBSYS:%=%_dist) \
-      $(SYS_APPS:%=%_dist) $(APPS:%=%_dist)
+      $(SYS_APPS:%=%_dist) $(APPS:%=%_dist) $(NET_APPS:%=%_dist)
 
 #
 # Build number generator
@@ -197,6 +201,24 @@ iface_additional_dist:
         iface_additional iface_additional_clean iface_additional_install \
         iface_additional_dist
 
+#
+# Bus driver rules
+#
+$(BUS): %:
+       make -C services/bus/$*
+
+$(BUS:%=%_clean): %_clean:
+       make -C services/bus/$* clean
+
+$(BUS:%=%_install): %_install:
+       make -C services/bus/$* install
+
+$(BUS:%=%_dist): %_dist:
+       make -C services/bus/$* dist
+
+.PHONY: $(BUS) $(BUS:%=%_clean) \
+        $(BUS:%=%_install) $(BUS:%=%_dist)
+
 #
 # Device driver rules
 #
@@ -248,6 +270,9 @@ $(FS_DRIVERS:%=%_dist): %_dist:
 .PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_clean) $(FS_DRIVERS:%=%_install) \
         $(FS_DRIVERS:%=%_dist)
 
+#
+# Network driver rules
+#
 $(NET_DRIVERS): %:
        make -C services/net/$*