Temporarily remove last few wine build targets that need some more work.

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index be7d305..8e7b22d 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -31,7 +31,7 @@ BUS = acpi isapnp pci
 # advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
 # oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
 DLLS = advapi32 crtdll fmifs gdi32 kernel32 packet msafd msvcrt ntdll \
-       secur32 user32 version ws2help ws2_32 wshirda
+       secur32 user32 version winmm ws2help ws2_32 wshirda
 SUBSYS = smss win32k csrss
 
 #
@@ -49,8 +49,8 @@ LOADERS = dos
 DRIVERS_LIB = bzip2 zlib
 
 # Kernel mode device drivers
-# beep blue floppy ide keyboard mouse null parallel ramdrv serial vga vidport
-DEVICE_DRIVERS = blue floppy ide null vga vidport
+# beep blue floppy ide keyboard mouse null parallel ramdrv serenum serial vga vidport
+DEVICE_DRIVERS = beep blue floppy ide null serial vga vidport
 
 # Kernel mode input drivers
 # keyboard mouclass psaux sermouse
@@ -74,7 +74,7 @@ STORAGE_DRIVERS = atapi cdrom class2 disk scsiport
 
 # System applications
 # autochk lsass services shell winlogon
-SYS_APPS = autochk services shell winlogon gstart
+SYS_APPS = autochk services shell winlogon gstart usetup
 
 # System services
 # rpcss eventlog
@@ -86,7 +86,7 @@ SYS_SVC = rpcss eventlog
 # pteb regtest sectest shm simple thread vmtest winhello
 TEST_APPS = alive apc args atomtest bench consume count dump_shared_data \
             event file gditest hello isotest lpc mstest mutex nptest \
-            pteb regtest sectest shm simple thread tokentest vmtest winhello
+            pteb regtest sectest shm simple thread tokentest vmtest winhello dibtest
 
 # Test applications
 # cabman cat net objdir partinfo pice ps stats
@@ -101,18 +101,20 @@ WINE_OTHER = unicode library
 
 WINE_TOOLS = bin2res wrc winebuild
 
-WINE_DLLS = comcat crtdll dsound dplayx richedit shlwapi twain
+WINE_DLLS = comcat crtdll comctl32 commdlg dsound dplayx imagehlp ole32 richedit \
+shlwapi shell32 shdocvw twain winspool
 
-#mapi32 ole32 oleaut32 oledlg olepro32 olecli olesvr \
-#shell32 comctl32 shfolder shdocvw commdlg winmm
-#ddraw dinput dplay serialui tapi32 urlmon winspool wintrust
-#winspool msinfo comcat
-#lzexpand (missing imports)
+#wininet urlmon winspool \
+#rpcrt4 # needed to make rcprt4 implib 
 
-WINE_PROGS = control expand osversioncheck regedit regsrv32 winver
+# mapi32 oleaut32 oledlg olepro32 olecli olesvr shfolder
+# winmm ddraw dinput dplay serialui tapi32 urlmon wintrust 
+# msinfo lzexpand (missing imports)
+
+WINE_PROGS = control expand osversioncheck regedit regsvr32 winver uninstaller
 # (waiting on wrc fix for the rest of these)
 # clock cmdlgtst  notepad  progman wcmd  
-# uninstaller winefile winemine winetest 
+# winefile winemine winetest uninstaller
 
 
 ifeq ($(ROS_BUILD_WINE),yes)
@@ -745,7 +747,7 @@ install_before:
        $(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
        $(CP) boot.bat $(INSTALL_DIR)/boot.bat
        $(CP) aboot.bat $(INSTALL_DIR)/aboot.bat
-       $(CP) system.hiv $(INSTALL_DIR)/system32/system.hiv
+       $(CP) system.hiv $(INSTALL_DIR)/system32/config/system.hiv
        $(CP) media/fonts/helb____.ttf $(INSTALL_DIR)/media/fonts/helb____.ttf
        $(CP) media/fonts/timr____.ttf $(INSTALL_DIR)/media/fonts/timr____.ttf
 
@@ -785,3 +787,4 @@ etags:
        find . -name "*.[ch]" -print | etags --language=c -
 
 # EOF
+