+# $Id$
#
# Global makefile
#
HALS = halx86/up halx86/mp
# Bus drivers
-# acpi isapnp pci
-BUS = acpi isapnp pci
+# acpi isapnp pci serenum
+BUS = acpi isapnp pci serenum
# Filesystem libraries
# 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 kbdru kbdse kbdsg kbduk kbdus
# Control Panels
DLLS_CPL = cpl
# 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 serialui setupapi shell32 shlwapi smlib smdll snmpapi \
+ syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \
+ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv dhcpcapi \
+ $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
SUBSYS = smss win32k csrss ntvdm
# 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 regsvr32 \
+ reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \
+ winlogon regedit winefile notepad reactos lsass dhcp
# System services
-# rpcss eventlog
-SYS_SVC = rpcss eventlog
+SYS_SVC = rpcss eventlog umpnpmgr
APPS = testsets utils
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
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
-
-#config: $(TOOLS:%=%_config)
+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) \
$(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) \
$(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
$(HALFVERBOSEECHO) [COPY] media/drivers/etc/services to $(BOOTCD_DIR)/reactos/services
$(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
+ $(HALFVERBOSEECHO) [COPY] media/drivers/etc/KDBinit to $(BOOTCD_DIR)/reactos/KDBinit
+ $(CP) media/drivers/etc/KDBinit $(BOOTCD_DIR)/reactos/KDBinit
bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
$(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
$(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/isoboot.bin to ${LIVECD_DIR}/../isoboot.bin
$(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${LIVECD_DIR}/../isoboot.bin
- $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys to ${LIVECD_DIR}/loader/setupldr.sys
- $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
+ $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/freeldr.sys to ${LIVECD_DIR}/loader/setupldr.sys
+ $(CP) ${FREELDR_DIR}/freeldr/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
$(HALFVERBOSEECHO) [RLINE] bootdata/livecd.ini to $(LIVECD_DIR)/freeldr.ini
$(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini
# 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
#
.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
#
# Hardware Abstraction Layers
#
-ifeq ($(MP),1)
+ifeq ($(CONFIG_SMP),1)
halx86: halx86/mp
else
halx86: halx86/up
$(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/*.*
$(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
$(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
$(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls
$(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/services to $(INSTALL_DIR)/system32/drivers/etc/services
$(CP) media/drivers/etc/services $(INSTALL_DIR)/system32/drivers/etc/services
+ $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/KDBinit to $(INSTALL_DIR)/system32/drivers/etc/KDBinit
+ $(CP) media/drivers/etc/KDBinit $(INSTALL_DIR)/system32/drivers/etc/KDBinit
.PHONY: install_clean install_dirs install_before