Build winebuild by bootstrap makefiles

svn path=/branches/xmlbuildsystem/; revision=14039
2026-06-25 10:07:31 +08:00 · 2005-03-13 22:33:13 +00:00
parent f6646e9181
commit 30c142ef2d
32 changed files with 70 additions and 44 deletions
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -158,7 +158,7 @@ PREAUTO := \
 	$(ERRCODES_RC) \
 	$(NCI_SERVICE_FILES)

-makefile.auto: $(RMKDIR_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+makefile.auto: $(RMKDIR_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	$(ECHO_RBUILD)
 	$(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw

--- a/reactos/lib/cabinet/cabinet.xml
+++ b/reactos/lib/cabinet/cabinet.xml
@@ -1,5 +1,4 @@
 <module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="cabinet.spec.def" />
 	<include base="cabinet">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/comctl32/comctl32.xml
+++ b/reactos/lib/comctl32/comctl32.xml
@@ -1,5 +1,4 @@
 <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="comctl32.spec.def" />
 	<include base="comctl32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/comdlg32/comdlg32.xml
+++ b/reactos/lib/comdlg32/comdlg32.xml
@@ -1,5 +1,4 @@
 <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="comdlg32.spec.def" />
 	<include base="comdlg32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/dbghelp/dbghelp.xml
+++ b/reactos/lib/dbghelp/dbghelp.xml
@@ -1,5 +1,4 @@
 <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="dbghelp.spec.def" />
 	<include base="dbghelp">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/devenum/devenum.xml
+++ b/reactos/lib/devenum/devenum.xml
@@ -1,5 +1,4 @@
 <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="devenum.spec.def" />
 	<include base="devenum">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/dinput/dinput.xml
+++ b/reactos/lib/dinput/dinput.xml
@@ -1,5 +1,4 @@
 <module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="dinput.spec.def" />
 	<include base="dinput">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/dinput8/dinput8.xml
+++ b/reactos/lib/dinput8/dinput8.xml
@@ -1,5 +1,4 @@
 <module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="dinput8.spec.def" />
 	<include base="dinput8">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/dxdiagn/dxdiagn.xml
+++ b/reactos/lib/dxdiagn/dxdiagn.xml
@@ -1,5 +1,4 @@
 <module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="dxdiagn.spec.def" />
 	<include base="dxdiagn">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/imagehlp/imagehlp.xml
+++ b/reactos/lib/imagehlp/imagehlp.xml
@@ -1,5 +1,4 @@
 <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="imagehlp.def" />
 	<include base="imagehlp">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/iphlpapi/iphlpapi.xml
+++ b/reactos/lib/iphlpapi/iphlpapi.xml
@@ -1,5 +1,4 @@
 <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="iphlpapi.spec.def" />
 	<include base="iphlpapi">include</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/midimap/midimap.xml
+++ b/reactos/lib/midimap/midimap.xml
@@ -1,5 +1,4 @@
 <module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="midimap.spec.def" />
 	<include base="midimap">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/mpr/mpr.xml
+++ b/reactos/lib/mpr/mpr.xml
@@ -1,5 +1,4 @@
 <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="mpr.spec.def" />
 	<include base="mpr">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/msacm/msacm32.xml
+++ b/reactos/lib/msacm/msacm32.xml
@@ -1,5 +1,4 @@
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="msacm32.spec.def" />
 	<include base="msacm32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/netapi32/netapi32.xml
+++ b/reactos/lib/netapi32/netapi32.xml
@@ -1,5 +1,4 @@
 <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="netapi32.spec.def" />
 	<include base="netapi32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/ole32/ole32.xml
+++ b/reactos/lib/ole32/ole32.xml
@@ -1,5 +1,4 @@
 <module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="ole32.spec.def" />
 	<include base="ole32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/oleaut32/oleaut32.xml
+++ b/reactos/lib/oleaut32/oleaut32.xml
@@ -1,5 +1,4 @@
 <module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="oleaut32.spec.def" />
 	<include base="oleaut32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/olepro32/olepro32.xml
+++ b/reactos/lib/olepro32/olepro32.xml
@@ -1,5 +1,4 @@
 <module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="olepro32.spec.def" />
 	<include base="olepro32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/richedit/riched32.xml
+++ b/reactos/lib/richedit/riched32.xml
@@ -1,5 +1,4 @@
 <module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="riched32.spec.def" />
 	<include base="riched32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/rpcrt4/rpcrt4.xml
+++ b/reactos/lib/rpcrt4/rpcrt4.xml
@@ -1,5 +1,4 @@
 <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="rpcrt4.spec.def" />
 	<include base="rpcrt4">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/setupapi/setupapi.xml
+++ b/reactos/lib/setupapi/setupapi.xml
@@ -1,5 +1,4 @@
 <module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="setupapi.spec.def" />
 	<include base="setupapi">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/shdocvw/shdocvw.xml
+++ b/reactos/lib/shdocvw/shdocvw.xml
@@ -1,5 +1,4 @@
 <module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="shdocvw.spec.def" />
 	<include base="shdocvw">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/shell32/shell32.xml
+++ b/reactos/lib/shell32/shell32.xml
@@ -1,5 +1,4 @@
 <module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="shell32.spec.def" />
 	<include base="shell32">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/shlwapi/shlwapi.xml
+++ b/reactos/lib/shlwapi/shlwapi.xml
@@ -1,5 +1,4 @@
 <module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="shlwapi.spec.def" />
 	<include base="shlwapi">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/urlmon/urlmon.xml
+++ b/reactos/lib/urlmon/urlmon.xml
@@ -1,5 +1,4 @@
 <module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="urlmon.spec.def" />
 	<include base="urlmon">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/lib/version/version.xml
+++ b/reactos/lib/version/version.xml
@@ -1,5 +1,4 @@
 <module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="version.def" />
 	<include base="ReactOS">include/wine</include>
 	<define name="_DISABLE_TIDENTS" />
--- a/reactos/lib/winmm/winmm.xml
+++ b/reactos/lib/winmm/winmm.xml
@@ -1,5 +1,4 @@
 <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}">
-	<dependency>winebuild</dependency>
 	<importlibrary definition="winmm.spec.def" />
 	<include base="winmm">.</include>
 	<include base="ReactOS">include/wine</include>
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -64,6 +64,7 @@ include tools/cdmake/cdmake.mak
 include tools/nci/nci.mak
 include tools/rbuild/rbuild.mak
 include tools/unicode/unicode.mak
+include tools/winebuild/winebuild.mak
 include tools/wmc/wmc.mak
 include tools/wpp/wpp.mak
 include tools/wrc/wrc.mak
--- a/reactos/tools/tools.xml
+++ b/reactos/tools/tools.xml
@@ -4,6 +4,3 @@
 <directory name="cabman">
 	<xi:include href="cabman/cabman.xml" />
 </directory>
-<directory name="winebuild">
-	<xi:include href="winebuild/winebuild.xml" />
-</directory>
--- a/reactos/tools/winebuild/winebuild.mak
+++ b/reactos/tools/winebuild/winebuild.mak
@@ -0,0 +1,67 @@
+WINEBUILD_BASE = tools$(SEP)winebuild
+
+WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)$(CREATED)
+
+$(WINEBUILD_BASE_DIR): $(RMKDIR_TARGET)
+	${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE)
+
+WINEBUILD_TARGET = \
+	$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)winebuild$(EXEPOSTFIX)
+
+WINEBUILD_SOURCES = \
+	$(WINEBUILD_BASE)$(SEP)import.c \
+	$(WINEBUILD_BASE)$(SEP)main.c \
+	$(WINEBUILD_BASE)$(SEP)parser.c \
+	$(WINEBUILD_BASE)$(SEP)res16.c \
+	$(WINEBUILD_BASE)$(SEP)res32.c \
+	$(WINEBUILD_BASE)$(SEP)spec32.c \
+	$(WINEBUILD_BASE)$(SEP)utils.c \
+	$(WINEBUILD_BASE)$(SEP)mkstemps.c
+
+WINEBUILD_OBJECTS = \
+  $(addprefix $(INTERMEDIATE), $(WINEBUILD_SOURCES:.c=.o))
+
+WINEBUILD_HOST_CFLAGS = -D__USE_W32API -Iinclude/wine
+
+WINEBUILD_HOST_LFLAGS = -g
+
+$(WINEBUILD_TARGET): $(WINEBUILD_BASE_DIR) $(WINEBUILD_OBJECTS)
+	$(ECHO_LD)
+	${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $(WINEBUILD_TARGET)
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)import.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)import.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)import.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)import.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)main.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)main.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)main.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)main.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)parser.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)parser.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)parser.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)parser.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res16.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)res16.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)res16.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res16.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res32.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)res32.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)res32.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res32.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)spec32.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)spec32.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)spec32.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)spec32.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)utils.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)utils.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)utils.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)utils.o
+
+$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)mkstemps.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)mkstemps.c
+	$(ECHO_CC)
+	${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)mkstemps.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)mkstemps.o
+
+.PHONY: winebuild_clean
+winebuild_clean:
+	-@$(rm) $(WINEBUILD_TARGET) $(WINEBUILD_OBJECTS) 2>$(NUL)
+clean: winebuild_clean
--- a/reactos/tools/winebuild/winebuild.xml
+++ b/reactos/tools/winebuild/winebuild.xml
@@ -1,13 +0,0 @@
-<module name="winebuild" type="buildtool">
-	<include base="winebuild">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="__USE_W32API" />
-	<file>import.c</file>
-	<file>main.c</file>
-	<file>mkstemps.c</file>
-	<file>parser.c</file>
-	<file>res16.c</file>
-	<file>res32.c</file>
-	<file>spec32.c</file>
-	<file>utils.c</file>
-</module>
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -6,7 +6,7 @@ $(WMC_BASE_DIR): $(RMKDIR_TARGET)
 	${mkdir} $(INTERMEDIATE)$(WMC_BASE)

 WMC_TARGET = \
-	$(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX)
+	$(INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX)

 WMC_SOURCES = \
 	$(WMC_BASE)$(SEP)getopt.c \