NtOpenThreadToken() opens the thread token if OpenAsSelf is FALSE.

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index bd0d0a0..3747754 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.223 2004/05/31 19:45:16 gdalsnes Exp $
+# $Id: Makefile,v 1.235 2004/07/10 21:44:14 sedwards Exp $
 #
 # Global makefile
 #
@@ -32,10 +32,10 @@ BUS = acpi isapnp pci
 LIB_FSLIB = vfatlib
 
 # Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl
+LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh
 
 # Keyboard layout libraries
-DLLS_KBD = kbdus kbdgr kbdfr kbduk
+DLLS_KBD = kbddv kbdfr kbdgr kbdse kbduk kbdus
 
 # Control Panels
 DLLS_CPL = cpl
@@ -44,8 +44,8 @@ DLLS_CPL = cpl
 # advapi32 cards crtdll comdlg32 fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll
 # epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
 # imagehlp imm32
-DLLS = advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
-       imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 mswsock \
+DLLS = acledit advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
+       imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 msvideo mswsock \
        netapi32 ntdll ole32 oleaut32 oledlg packet psapi richedit rpcrt4 samlib secur32 \
        setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 userenv version wininet \
        winmm winspool ws2help ws2_32 wsock32 wshirda imagehlp $(DLLS_KBD) $(DLLS_CPL)
@@ -64,12 +64,12 @@ LOADERS = dos
 
 # Driver support libraries
 #bzip2 zlib oskittcp
-DRIVERS_LIB = bzip2 oskittcp
+DRIVERS_LIB = bzip2 oskittcp csq
 
 # Kernel mode device drivers
 # Obsolete: ide
 # beep blue floppy null parallel ramdrv serenum serial
-DEVICE_DRIVERS = beep blue debugout floppy null serial bootvid
+DEVICE_DRIVERS = beep blue debugout null serial bootvid
 
 # Kernel mode input drivers
 INPUT_DRIVERS = keyboard mouclass psaux sermouse
@@ -88,11 +88,11 @@ NET_DEVICE_DRIVERS = ne2000 pcnet
 
 # Kernel mode storage drivers
 # atapi cdrom class2 disk scsiport
-STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump
+STORAGE_DRIVERS = atapi cdrom class2 disk floppy 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
+SYS_APPS = autochk cmd explorer expand format services setup taskmgr userinit usetup welcome vmwinst winlogon regedit
 
 # System services
 # rpcss eventlog
@@ -187,6 +187,7 @@ bootcd_install_before:
        $(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls
        $(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
        $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
+       $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
 
 bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
 
@@ -199,12 +200,36 @@ bootcd_makecd:
 ubootcd_unattend:
        $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf
 
+livecd_directory_layout:
+       $(RMKDIR) $(LIVECD_DIR)
+       $(RMKDIR) $(LIVECD_DIR)/loader
+       $(RMKDIR) $(LIVECD_DIR)/reactos
+       $(RMKDIR) $(LIVECD_DIR)/Profiles/All\ Users/Desktop
+       $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/Desktop
+       $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents
+       $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${LIVECD_DIR}/../isoboot.bin
+       $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys
+       $(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini
+
+livecd_bootstrap_files:
+       $(MAKE) LIVECD_INSTALL=yes fastinstall
+
+livecd_install_before:
+       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(LIVECD_DIR)/reactos/system32/config bootdata/livecd.inf bootdata/hiveinst.inf
+
+livecd_basic: livecd_directory_layout livecd_bootstrap_files livecd_install_before
+
+livecd_makecd:
+       $(TOOLS_PATH)/cdmake/cdmake -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso
+
 bootcd: bootcd_basic bootcd_makecd
 
 ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd
 
+livecd: livecd_basic livecd_makecd
+
 registry: tools
-       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(INSTALL_DIR)/system32/config
+       $(TOOLS_PATH)/mkhive/mkhive$(EXE_POSTFIX) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf
 
 .PHONY: all depends implib clean clean_before install freeldr bootcd_directory_layout \
 bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd
@@ -805,6 +830,7 @@ install_dirs:
        $(RMKDIR) $(INSTALL_DIR)/system32
        $(RMKDIR) $(INSTALL_DIR)/system32/config
        $(RMKDIR) $(INSTALL_DIR)/system32/drivers
+       $(RMKDIR) $(INSTALL_DIR)/system32/drivers/etc
 
 install_before:
        $(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
@@ -815,6 +841,8 @@ install_before:
        $(CP) media/nls/c_1252.nls $(INSTALL_DIR)/system32/ansi.nls
        $(CP) media/nls/c_437.nls $(INSTALL_DIR)/system32/oem.nls
        $(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls
+       $(CP) media/drivers/etc/services \
+               $(INSTALL_DIR)/system32/drivers/etc/services
 
 .PHONY: install_clean install_dirs install_before