merged in MDL fix and a makefile mod from the 0.1.4 release branch. This represents...

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index 90174e7..589a4d7 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.175 2003/10/15 22:16:43 vizzini Exp $
 #
 # Global makefile
 #
@@ -35,10 +36,10 @@ LIB_STATIC = string rosrtl epsapi zlib
 
 # User mode libraries
 # advapi32 cards crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll
-# epsapi psapi rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda
+# epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
 DLLS = advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand msafd \
-       msvcrt ntdll psapi secur32 syssetup twain user32 version winedbgc \
-       winspool ws2help ws2_32 wsock32 wshirda iphlpapi kbdus
+       msvcrt ntdll psapi richedit secur32 syssetup twain user32 version winedbgc \
+       winspool ws2help ws2_32 wsock32 wshirda iphlpapi kbdus mswsock msimg32
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -73,8 +74,8 @@ FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
 NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip
 
 # Kernel mode networking device drivers
-# ne2000
-NET_DEVICE_DRIVERS = ne2000
+# ne2000 pcnet
+NET_DEVICE_DRIVERS = ne2000 pcnet
 
 # Kernel mode storage drivers
 # atapi cdrom class2 disk scsiport
@@ -165,7 +166,6 @@ bootcd_directory_layout: freeldr
        $(CP) ${FREELDR_DIR}/bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin
        $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin
        $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys
-       $(CP) ${FREELDR_DIR}/FREELDR.INI ${BOOTCD_DIR}/loader/freeldr.ini
        $(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys
 
 bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \
@@ -185,14 +185,26 @@ bootcd_install_before:
        $(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
        $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
 
-bootcd: all bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
+bootcd_basic: all bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
+
+bootcd_makecd:
        $(CABMAN) /C bootdata/packages/reactos.dff /L $(BOOTCD_DIR)/reactos /I
        $(CABMAN) /C bootdata/packages/reactos.dff /RC $(BOOTCD_DIR)/reactos/reactos.inf /L $(BOOTCD_DIR)/reactos /N
        - $(RM) $(BOOTCD_DIR)/reactos/reactos.inf
        $(TOOLS_PATH)/cdmake/cdmake -v -m -b $(BOOTCD_DIR)/../isoboot.bin $(BOOTCD_DIR) REACTOS ReactOS.iso
 
+ubootcd_unattend:
+       $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
+
+bootcd: bootcd_basic bootcd_makecd
+
+ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd
+
+registry: tools
+       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(INSTALL_DIR)/system32/config
+
 .PHONY: all depends implib clean clean_before install dist freeldr bootcd_directory_layout \
-bootcd_bootstrap_files bootcd
+bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd
 
 
 #