projects / reactos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update files (rundll32 moved)
[reactos.git] / reactos / Makefile
diff --git a/reactos/Makefile b/reactos/Makefile
index 48d392a..475c184 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,3 +1,4 @@
+# $Id$
 #
 # Global makefile
 #
@@ -40,11 +41,14 @@ BUS = acpi isapnp pci
 # vfatlib
 LIB_FSLIB = vfatlib
 
+# libunicode, must be empty!
+LIBUNICODE = 
+
 # Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids
+LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym wdmguid
 
 # Keyboard layout libraries
-DLLS_KBD = kbdda kbddv kbdfr kbdgr kbdse kbduk kbdus 
+DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus
 
 # Control Panels
 DLLS_CPL = cpl
@@ -56,10 +60,10 @@ DLLS_SHELLEXT = shellext
 # libpcap packet epsapi
 DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \
        gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \
-       msgina msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \
-       packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain \
-       unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \
-       urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
+       msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \
+       packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \
+       twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \
+       urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -99,13 +103,12 @@ STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
 
 # System applications
 # autochk cmd format services setup usetup welcome winlogon msiexec 
-SYS_APPS = autochk calc cmd explorer expand format regedt32 regsvr32 \
-  reporterror services setup taskmgr userinit usetup welcome vmwinst \
-  winlogon regedit winefile notepad reactos
+SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \
+  reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \
+  winlogon regedit winefile notepad reactos lsass
 
 # System services
-# rpcss eventlog
-SYS_SVC = rpcss eventlog
+SYS_SVC = rpcss eventlog umpnpmgr
 
 APPS = testsets utils
 
@@ -121,7 +124,7 @@ EXT_MODULES =
 endif
 
 KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
-       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS
+       $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS USB_DRIVERS
 
 # Regression tests
 REGTESTS = regtests
@@ -129,13 +132,13 @@ REGTESTS = regtests
 all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \
      $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES)
 
-bootstrap: dk implib iface_native iface_additional
+bootstrap: dk implib iface_native
 
 depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) msvcrt_depends $(DLLS:%=%_depends) \
          $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \
          $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends)
 
-implib: hallib $(LIB_STATIC) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \
+implib: hallib $(LIB_STATIC) $(LIB_FSLIB) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \
         $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) \
         msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \
         $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \
@@ -146,7 +149,7 @@ test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%
            $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \
            $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test)
 
-clean: tools dk_clean iface_native_clean iface_additional_clean hallib_clean \
+clean: tools dk_clean iface_native_clean hallib_clean \
        $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \
        $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \
        msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \
@@ -461,37 +464,21 @@ dk_install:
 # Interfaces
 #
 iface_native:
-       $(MAKE) --silent -C iface/native
+       $(MAKE) --silent -C tools/nci
 
 iface_native_implib:
        
 iface_native_test:
        
 iface_native_clean:
-       $(MAKE) --silent -C iface/native clean
+       $(MAKE) --silent -C tools/nci clean
 
 iface_native_install:
 
 iface_native_bootcd:
 
-iface_additional:
-       $(MAKE) --silent -C iface/addsys
-
-iface_additional_implib:
-       
-iface_additional_test:
-       
-iface_additional_clean:
-       $(MAKE) --silent -C iface/addsys clean
-
-iface_additional_install:
-
-iface_additional_bootcd:
-
 .PHONY: iface_native iface_native_implib iface_native_test iface_native_clean \
-        iface_native_install iface_native_bootcd iface_additional \
-        iface_additional_implib iface_additional_test iface_additional_clean \
-        iface_additional_install iface_additional_bootcd
+        iface_native_install iface_native_bootcd
 
 
 #
@@ -593,6 +580,30 @@ VIDEO_DRIVERS_bootcd:
 .PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_test\
         VIDEO_DRIVERS_clean VIDEO_DRIVERS_install VIDEO_DRIVERS_bootcd
 
+#
+# USB device driver rules
+#
+USB_DRIVERS: $(IMPLIB)
+       $(MAKE) -C drivers/usb
+
+USB_DRIVERS_implib: dk
+       $(MAKE) --silent -C drivers/usb implib
+
+USB_DRIVERS_test:
+       $(MAKE) -C drivers/usb test
+
+USB_DRIVERS_clean:
+       $(MAKE) -C drivers/usb clean
+
+USB_DRIVERS_install:
+       $(MAKE) -C drivers/usb install
+
+USB_DRIVERS_bootcd:
+       $(MAKE) -C drivers/usb bootcd
+
+.PHONY: USB_DRIVERS USB_DRIVERS_implib USB_DRIVERS_test\
+        USB_DRIVERS_clean USB_DRIVERS_install USB_DRIVERS_bootcd
+
 
 #
 # Input driver rules
@@ -773,7 +784,7 @@ hallib_bootcd:
 #
 # Hardware Abstraction Layers
 #
-ifeq ($(MP),1)
+ifeq ($(CONFIG_SMP),1)
 halx86: halx86/mp
 else
 halx86: halx86/up
@@ -972,8 +983,6 @@ install_clean:
        $(RM) $(INSTALL_DIR)/system32/config/*.*
        $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/system32/*.*
        $(RM) $(INSTALL_DIR)/system32/*.*
-       $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/symbols/*.*
-       $(RM) $(INSTALL_DIR)/symbols/*.*
        $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/media/fonts/*.*
        $(RM) $(INSTALL_DIR)/media/fonts/*.*
        $(HALFVERBOSEECHO) [RM]      $(INSTALL_DIR)/media/*.*
@@ -988,8 +997,6 @@ install_clean:
        $(RMDIR) $(INSTALL_DIR)/system32/config
        $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/system32
        $(RMDIR) $(INSTALL_DIR)/system32
-       $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/symbols
-       $(RMDIR) $(INSTALL_DIR)/symbols
        $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/media/fonts
        $(RMDIR) $(INSTALL_DIR)/media/fonts
        $(HALFVERBOSEECHO) [RMDIR]   $(INSTALL_DIR)/media
@@ -1012,8 +1019,6 @@ install_dirs:
        $(RMKDIR) $(INSTALL_DIR)/media
        $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/media/fonts
        $(RMKDIR) $(INSTALL_DIR)/media/fonts
-       $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/symbols
-       $(RMKDIR) $(INSTALL_DIR)/symbols
        $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32
        $(RMKDIR) $(INSTALL_DIR)/system32
        $(HALFVERBOSEECHO) [RMKDIR]  $(INSTALL_DIR)/system32/config
A free Windows-compatible Operating System