* Build bin2res and cabman in bootstrap makefiles

* Remove make directory hack as it wasn't needed anyway

svn path=/branches/xmlbuildsystem/; revision=14066

diff --git a/reactos/Makefile b/reactos/Makefile
index c79c4ca..f32aaff 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -133,11 +133,9 @@ else
 endif
 
 mkdir = $(Q)$(INTERMEDIATE)rmkdir
 endif
 
 mkdir = $(Q)$(INTERMEDIATE)rmkdir

-CREATED = .created

 
 

-directories:
-       -${nmkdir} $(INTERMEDIATE_NO_SLASH)
-       -${nmkdir} $(OUTPUT_NO_SLASH)
+$(INTERMEDIATE_NO_SLASH):
+       ${nmkdir} $(INTERMEDIATE_NO_SLASH)

 
 NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc
 KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc
 
 NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc
 KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc


@@ -158,7 +156,7 @@ PREAUTO := \
        $(ERRCODES_RC) \
        $(NCI_SERVICE_FILES)
 
        $(ERRCODES_RC) \
        $(NCI_SERVICE_FILES)
 

-makefile.auto: $(RMKDIR_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+makefile.auto: $(RMKDIR_TARGET) $(BIN2RES_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)

        $(ECHO_RBUILD)
        $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
 
        $(ECHO_RBUILD)
        $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
 

diff --git a/reactos/ReactOS.xml b/reactos/ReactOS.xml
index 8f8d2a3..80ba92a 100644 (file)
--- a/reactos/ReactOS.xml
+++ b/reactos/ReactOS.xml
@@ -35,9 +35,6 @@
        <directory name="drivers">\r
                <xi:include href="drivers/directory.xml" />\r
        </directory>\r
        <directory name="drivers">\r
                <xi:include href="drivers/directory.xml" />\r
        </directory>\r

-       <directory name="tools">\r
-               <xi:include href="tools/tools.xml" />\r
-       </directory>\r

        <directory name="hal">\r
                <xi:include href="hal/directory.xml" />\r
        </directory>\r
        <directory name="hal">\r
                <xi:include href="hal/directory.xml" />\r
        </directory>\r

diff --git a/reactos/lib/zlib/zlib.mak b/reactos/lib/zlib/zlib.mak
new file mode 100755 (executable)
index 0000000..4801572
--- /dev/null
+++ b/reactos/lib/zlib/zlib.mak
@@ -0,0 +1,46 @@
+ZLIB_BASE = lib$(SEP)zlib
+
+ZLIB_BASE_DIR = $(INTERMEDIATE)$(ZLIB_BASE)
+
+#$(ZLIB_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)
+#      ${mkdir} $(INTERMEDIATE)$(ZLIB_BASE)
+
+ZLIB_HOST_TARGET = \
+       $(INTERMEDIATE)$(ZLIB_BASE)$(SEP)zlib.host.a
+
+ZLIB_HOST_SOURCES = \
+       $(ZLIB_BASE)$(SEP)cdmake.c \
+       $(ZLIB_BASE)$(SEP)llmosrt.c \
+       $(ZLIB_BASE)$(SEP)adler32.c \
+       $(ZLIB_BASE)$(SEP)compress.c \
+       $(ZLIB_BASE)$(SEP)crc32.c \
+       $(ZLIB_BASE)$(SEP)gzio.c \
+       $(ZLIB_BASE)$(SEP)uncompr.c \
+       $(ZLIB_BASE)$(SEP)deflate.c \
+       $(ZLIB_BASE)$(SEP)trees.c \
+       $(ZLIB_BASE)$(SEP)zutil.c \
+       $(ZLIB_BASE)$(SEP)inflate.c \
+       $(ZLIB_BASE)$(SEP)infblock.c \
+       $(ZLIB_BASE)$(SEP)inftrees.c \
+       $(ZLIB_BASE)$(SEP)infcodes.c \
+       $(ZLIB_BASE)$(SEP)infutil.c \
+       $(ZLIB_BASE)$(SEP)inffast.c
+
+ZLIB_HOST_OBJECTS = \
+       $(ZLIB_HOST_SOURCES:.c=.o)
+
+ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+  -Wstrict-prototypes -Wmissing-prototypes
+
+$(ZLIB_HOST_TARGET): $(ZLIB_HOST_BASE_DIR) $(ZLIB_HOST_OBJECTS)
+       $(ECHO_AR)
+       $(host_ar) -r $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS)
+
+$(ZLIB_HOST_OBJECTS): %.o : %.c $(ZLIB_BASE_DIR)
+       $(ECHO_CC)
+       ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@
+
+.PHONY: zlib_host_clean
+zlib_host_clean:
+       -@$(rm) $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) 2>$(NUL)
+clean: zlib_clean

diff --git a/reactos/lib/zlib/zlib.xml b/reactos/lib/zlib/zlib.xml
index bc2d962..61acd9e 100644 (file)
--- a/reactos/lib/zlib/zlib.xml
+++ b/reactos/lib/zlib/zlib.xml
@@ -1,7 +1,3 @@
 <module name="zlib" type="staticlibrary">\r
        <xi:include href="zlib_common.xml" />\r
 </module>\r
 <module name="zlib" type="staticlibrary">\r
        <xi:include href="zlib_common.xml" />\r
 </module>\r

-\r
-<module name="hostzlib" type="staticlibrary" host="true" prefix="host_">\r
-       <xi:include href="zlib_common.xml" />\r
-</module>\r

diff --git a/reactos/tools/bin2res/Makefile b/reactos/tools/bin2res/Makefile
deleted file mode 100644 (file)
index 3e110c0..0000000
--- a/reactos/tools/bin2res/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-PATH_TO_TOP = ../..
-
-TARGET = bin2res$(EXE_POSTFIX)
-
-all: $(TARGET)
-
-OBJECTS = bin2res.o mkstemps.o
-
-CLEAN_FILES = *.o bin2res$(EXE_POSTFIX)
-
-HOST_CFLAGS = -I$(PATH_TO_TOP)/include/wine -D__REACTOS__ -Wall -Werror
-
-bin2res.o: bin2res.c
-       $(HOST_CC) -g $(HOST_CFLAGS) -c bin2res.c -o bin2res.o
-
-mkstemps.o: mkstemps.c
-       $(HOST_CC) -g $(HOST_CFLAGS) -c mkstemps.c -o mkstemps.o
-
-bin2res$(EXE_POSTFIX): $(OBJECTS)
-       $(HOST_CC) -g $(OBJECTS) -o $(TARGET)
-
-ifeq ($(HOST),mingw32-linux)
-clean:
-       rm -f *.o $(TARGET)
-endif
-ifneq ($(HOST),mingw32-linux)
-clean:
-       del *.o $(TARGET)
-endif
-
-.PHONY: clean
-
-include $(PATH_TO_TOP)/rules.mak

diff --git a/reactos/tools/bin2res/bin2res.mak b/reactos/tools/bin2res/bin2res.mak
new file mode 100644 (file)
index 0000000..b1ce0c7
--- /dev/null
+++ b/reactos/tools/bin2res/bin2res.mak
@@ -0,0 +1,33 @@
+BIN2RES_BASE = tools$(SEP)bin2res
+
+BIN2RES_BASE_DIR = $(INTERMEDIATE)$(BIN2RES_BASE)
+
+$(BIN2RES_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)
+       ${mkdir} $(INTERMEDIATE)$(BIN2RES_BASE)
+
+BIN2RES_TARGET = \
+       $(INTERMEDIATE)$(BIN2RES_BASE)$(SEP)bin2res$(EXEPOSTFIX)
+
+BIN2RES_SOURCES = \
+       $(BIN2RES_BASE)$(SEP)bin2res.c \
+       $(BIN2RES_BASE)$(SEP)mkstemps.c
+
+BIN2RES_OBJECTS = \
+       $(BIN2RES_SOURCES:.c=.o)
+
+BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ -g -Werror -Wall
+
+BIN2RES_HOST_LFLAGS = -g
+
+$(BIN2RES_TARGET): $(BIN2RES_BASE_DIR) $(BIN2RES_OBJECTS)
+       $(ECHO_LD)
+       ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $(BIN2RES_TARGET)
+
+$(BIN2RES_OBJECTS): %.o : %.c $(BIN2RES_BASE_DIR)
+       $(ECHO_CC)
+       ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@
+
+.PHONY: bin2res_clean
+bin2res_clean:
+       -@$(rm) $(BIN2RES_TARGET) $(BIN2RES_OBJECTS) 2>$(NUL)
+clean: bin2res_clean

diff --git a/reactos/tools/bin2res/bin2res.xml b/reactos/tools/bin2res/bin2res.xml
deleted file mode 100644 (file)
index fb64b8d..0000000
--- a/reactos/tools/bin2res/bin2res.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<module name="bin2res" type="buildtool">\r
-       <include base="ReactOS">include/wine</include>\r
-       <define name="__REACTOS__" />\r
-       <file>bin2res.c</file>\r
-       <file>mkstemps.c</file>\r
-</module>\r

diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak
index 29664a6..cf95d08 100644 (file)
--- a/reactos/tools/buildno/buildno.mak
+++ b/reactos/tools/buildno/buildno.mak
@@ -1,6 +1,6 @@
 BUILDNO_BASE = tools$(SEP)buildno
 
 BUILDNO_BASE = tools$(SEP)buildno
 

-BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)$(CREATED)
+BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE)

 
 $(BUILDNO_BASE_DIR): $(RMKDIR_TARGET)
        ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE)
 
 $(BUILDNO_BASE_DIR): $(RMKDIR_TARGET)
        ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE)


@@ -23,7 +23,7 @@ BUILDNO_HOST_LFLAGS = -g
 
 $(BUILDNO_TARGET): $(BUILDNO_BASE_DIR) $(BUILDNO_OBJECTS)
        $(ECHO_LD)
 
 $(BUILDNO_TARGET): $(BUILDNO_BASE_DIR) $(BUILDNO_OBJECTS)
        $(ECHO_LD)

-       ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET)
+       ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $(BUILDNO_TARGET)

 
 $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)buildno.cpp
        $(ECHO_CC)
 
 $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)buildno.cpp
        $(ECHO_CC)

diff --git a/reactos/tools/cabman/cabman.mak b/reactos/tools/cabman/cabman.mak
new file mode 100755 (executable)
index 0000000..5564695
--- /dev/null
+++ b/reactos/tools/cabman/cabman.mak
@@ -0,0 +1,51 @@
+CABMAN_BASE = tools$(SEP)cabman
+
+CABMAN_BASE_DIR = $(INTERMEDIATE)$(CABMAN_BASE)
+
+$(CABMAN_BASE_DIR): $(RMKDIR_TARGET)
+       ${mkdir} $(INTERMEDIATE)$(CABMAN_BASE)
+
+CABMAN_TARGET = \
+       $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabman$(EXEPOSTFIX)
+
+CABMAN_SOURCES = \
+       $(CABMAN_BASE)$(SEP)cabinet.cxx \
+       $(CABMAN_BASE)$(SEP)dfp.cxx \
+       $(CABMAN_BASE)$(SEP)main.cxx \
+       $(CABMAN_BASE)$(SEP)mszip.cxx \
+       $(CABMAN_BASE)$(SEP)raw.cxx
+
+CABMAN_OBJECTS = \
+  $(addprefix $(INTERMEDIATE), $(CABMAN_SOURCES:.cxx=.o))
+
+CABMAN_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall
+
+CABMAN_HOST_LFLAGS = -g $(ZLIB_HOST_TARGET)
+
+$(CABMAN_TARGET): $(CABMAN_BASE_DIR) $(CABMAN_OBJECTS)
+       $(ECHO_LD)
+       ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $(CABMAN_TARGET)
+
+$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)cabinet.cxx
+       $(ECHO_CC)
+       ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)cabinet.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o
+
+$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)dfp.cxx
+       $(ECHO_CC)
+       ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)dfp.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o
+
+$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)main.cxx
+       $(ECHO_CC)
+       ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)main.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o
+
+$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)mszip.cxx
+       $(ECHO_CC)
+       ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)mszip.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o
+
+$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)raw.cxx
+       $(ECHO_CC)
+       ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)raw.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o
+
+.PHONY: cabman_clean
+cabman_clean:
+       -@$(rm) $(CABMAN_TARGET) $(CABMAN_OBJECTS) 2>$(NUL)

diff --git a/reactos/tools/cabman/cabman.xml b/reactos/tools/cabman/cabman.xml
deleted file mode 100644 (file)
index f436e97..0000000
--- a/reactos/tools/cabman/cabman.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<module name="cabman" type="buildtool">\r
-       <include base="cabman">.</include>\r
-       <include base="hostzlib">.</include>\r
-       <library>hostzlib</library>\r
-       <file>cabinet.cxx</file>\r
-       <file>dfp.cxx</file>\r
-       <file>main.cxx</file>\r
-       <file>mszip.cxx</file>\r
-       <file>raw.cxx</file>\r
-</module>
\ No newline at end of file

diff --git a/reactos/tools/cabman/makefile b/reactos/tools/cabman/makefile
deleted file mode 100755 (executable)
index 46936b6..0000000
--- a/reactos/tools/cabman/makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP = ../..
-DEFAULT = cabman
-include $(TOP)/proxy.mak
\ No newline at end of file

diff --git a/reactos/tools/cdmake/cdmake.mak b/reactos/tools/cdmake/cdmake.mak
index 105e5e7..befbd71 100644 (file)
--- a/reactos/tools/cdmake/cdmake.mak
+++ b/reactos/tools/cdmake/cdmake.mak
@@ -1,8 +1,8 @@
 CDMAKE_BASE = tools$(SEP)cdmake
 
 CDMAKE_BASE = tools$(SEP)cdmake
 

-CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE)$(SEP)$(CREATED)
+CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE)

 
 

-$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET)
+$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)

        ${mkdir} $(INTERMEDIATE)$(CDMAKE_BASE)
 
 CDMAKE_TARGET = \
        ${mkdir} $(INTERMEDIATE)$(CDMAKE_BASE)
 
 CDMAKE_TARGET = \


@@ -21,11 +21,11 @@ CDMAKE_HOST_LFLAGS = -g
 
 $(CDMAKE_TARGET): $(CDMAKE_BASE_DIR) $(CDMAKE_OBJECTS)
        $(ECHO_LD)
 
 $(CDMAKE_TARGET): $(CDMAKE_BASE_DIR) $(CDMAKE_OBJECTS)
        $(ECHO_LD)

-       ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET)
+       ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $(CDMAKE_TARGET)

 
 $(CDMAKE_OBJECTS): %.o : %.c $(CDMAKE_BASE_DIR)
        $(ECHO_CC)
 
 $(CDMAKE_OBJECTS): %.o : %.c $(CDMAKE_BASE_DIR)
        $(ECHO_CC)

-       ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@
+       ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@

 
 .PHONY: cdmake_clean
 cdmake_clean:
 
 .PHONY: cdmake_clean
 cdmake_clean:

diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak
index f0b767b..0b9458a 100644 (file)
--- a/reactos/tools/nci/nci.mak
+++ b/reactos/tools/nci/nci.mak
@@ -1,8 +1,8 @@
 NCI_BASE = tools$(SEP)nci
 
 NCI_BASE = tools$(SEP)nci
 

-CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE)$(SEP)$(CREATED)
+CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE)

 
 

-$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET)
+$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)

        ${mkdir} $(INTERMEDIATE)$(NCI_BASE)
 
 NCI_TARGET = \
        ${mkdir} $(INTERMEDIATE)$(NCI_BASE)
 
 NCI_TARGET = \

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 610439b..af30e8c 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -32,12 +32,6 @@ MingwBackend::CreateDirectoryTargetIfNotYetCreated ( const string& directory )
        directories.insert ( directory );\r
 }\r
 \r
        directories.insert ( directory );\r
 }\r
 \r

-const string\r
-MingwBackend::GetDirectoryDependency ( const string& directory )\r
-{\r
-       return directory + SSEP "$(CREATED)";\r
-}\r
-\r

 \r
 void\r
 MingwBackend::Process ()\r
 \r
 void\r
 MingwBackend::Process ()\r


@@ -343,7 +337,7 @@ MingwBackend::GenerateDirectoryTargets ()
                {\r
                        fprintf ( fMakefile,\r
                                  "%s:\n",\r
                {\r
                        fprintf ( fMakefile,\r
                                  "%s:\n",\r

-                                 GetDirectoryDependency ( *i ).c_str () );\r
+                                 i->c_str () );\r

                        fprintf ( fMakefile, \r
                                  "\t${mkdir} %s\n\n",\r
                                  i->c_str () );\r
                        fprintf ( fMakefile, \r
                                  "\t${mkdir} %s\n\n",\r
                                  i->c_str () );\r

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.h b/reactos/tools/rbuild/backend/mingw/mingw.h
index d7cabbb..fc8b38c 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.h
+++ b/reactos/tools/rbuild/backend/mingw/mingw.h
@@ -11,7 +11,6 @@ public:
        virtual ~MingwBackend () { };\r
        virtual void Process ();\r
        void CreateDirectoryTargetIfNotYetCreated ( const std::string& directory );\r
        virtual ~MingwBackend () { };\r
        virtual void Process ();\r
        void CreateDirectoryTargetIfNotYetCreated ( const std::string& directory );\r

-       const std::string GetDirectoryDependency ( const std::string& directory );\r

 private:\r
        void ProcessModule ( Module& module );\r
        void CreateMakefile ();\r
 private:\r
        void ProcessModule ( Module& module );\r
        void CreateMakefile ();\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 8757cc4..9ef1b3a 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -90,12 +90,6 @@ MingwModuleHandler::PassThruCacheDirectory ( const string &file )
        return file;\r
 }\r
 \r
        return file;\r
 }\r
 \r

-const string\r
-MingwModuleHandler::GetDirectoryDependency ( const string& file )\r
-{\r
-       return backend->GetDirectoryDependency ( GetDirectory ( file ) );\r
-}\r
-\r

 void\r
 MingwModuleHandler::SetMakefile ( FILE* f )\r
 {\r
 void\r
 MingwModuleHandler::SetMakefile ( FILE* f )\r
 {\r


@@ -733,7 +727,7 @@ MingwModuleHandler::GenerateGccCommand ( const Module& module,
        fprintf ( fMakefile,\r
                  "%s: %s %s\n",\r
                  objectFilename.c_str (),\r
        fprintf ( fMakefile,\r
                  "%s: %s %s\n",\r
                  objectFilename.c_str (),\r

-                 GetDirectoryDependency ( objectFilename ).c_str (),\r
+                 objectFilename.c_str (),\r

                  deps.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_CC)\n" );\r
        fprintf ( fMakefile,\r
                  deps.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_CC)\n" );\r
        fprintf ( fMakefile,\r


@@ -755,7 +749,7 @@ MingwModuleHandler::GenerateGccAssemblerCommand ( const Module& module,
        fprintf ( fMakefile,\r
                  "%s: %s %s\n",\r
                  objectFilename.c_str (),\r
        fprintf ( fMakefile,\r
                  "%s: %s %s\n",\r
                  objectFilename.c_str (),\r

-                 GetDirectoryDependency ( objectFilename ).c_str (),\r
+                 objectFilename.c_str (),\r

                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_GAS)\n" );\r
        fprintf ( fMakefile,\r
                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_GAS)\n" );\r
        fprintf ( fMakefile,\r


@@ -776,7 +770,7 @@ MingwModuleHandler::GenerateNasmCommand ( const Module& module,
        fprintf ( fMakefile,\r
                  "%s: %s %s\n",\r
                  objectFilename.c_str (),\r
        fprintf ( fMakefile,\r
                  "%s: %s %s\n",\r
                  objectFilename.c_str (),\r

-                 GetDirectoryDependency ( objectFilename ).c_str (),\r
+                 objectFilename.c_str (),\r

                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_NASM)\n" );\r
        fprintf ( fMakefile,\r
                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_NASM)\n" );\r
        fprintf ( fMakefile,\r


@@ -801,7 +795,7 @@ MingwModuleHandler::GenerateWindresCommand ( const Module& module,
        fprintf ( fMakefile,\r
                  "%s: %s %s $(WRC_TARGET)\n",\r
                  objectFilename.c_str (),\r
        fprintf ( fMakefile,\r
                  "%s: %s %s $(WRC_TARGET)\n",\r
                  objectFilename.c_str (),\r

-                 GetDirectoryDependency ( objectFilename ).c_str (),\r
+                 objectFilename.c_str (),\r

                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );\r
        fprintf ( fMakefile,\r
                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );\r
        fprintf ( fMakefile,\r


@@ -1375,7 +1369,7 @@ MingwModuleHandler::GenerateImportLibraryTargetIfNeeded (
                string definitionDependencies = GetDefinitionDependencies ( module );\r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          library_target.c_str (),\r
                string definitionDependencies = GetDefinitionDependencies ( module );\r
                fprintf ( fMakefile, "%s: %s %s\n",\r
                          library_target.c_str (),\r

-                         GetDirectoryDependency ( library_target ).c_str (),\r
+                         library_target.c_str (),\r

                          definitionDependencies.c_str () );\r
 \r
                fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );\r
                          definitionDependencies.c_str () );\r
 \r
                fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );\r


@@ -2191,7 +2185,7 @@ MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string& bootcdDirectory
                        string targetDirecctory = bootcdDirectory + SSEP + m.bootstrap->base;\r
                        if ( directories.size () > 0 )\r
                                directories += " ";\r
                        string targetDirecctory = bootcdDirectory + SSEP + m.bootstrap->base;\r
                        if ( directories.size () > 0 )\r
                                directories += " ";\r

-                       directories += GetDirectoryDependency ( PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ) );\r
+                       directories += PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) );\r

                }\r
        }\r
        return directories;\r
                }\r
        }\r
        return directories;\r


@@ -2208,7 +2202,7 @@ MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string& bootcdDirectory
                string targetDirecctory = bootcdDirectory + SSEP + cdfile.base;\r
                if ( directories.size () > 0 )\r
                        directories += " ";\r
                string targetDirecctory = bootcdDirectory + SSEP + cdfile.base;\r
                if ( directories.size () > 0 )\r
                        directories += " ";\r

-               directories += GetDirectoryDependency ( PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ) );\r
+               directories += PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) );\r

        }\r
        return directories;\r
 }\r
        }\r
        return directories;\r
 }\r


@@ -2280,7 +2274,7 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module, string_li
                  "%s: all %s %s %s %s ${CABMAN_TARGET} ${CDMAKE_TARGET}\n",\r
                  module.name.c_str (),\r
                  isoboot.c_str (),\r
                  "%s: all %s %s %s %s ${CABMAN_TARGET} ${CDMAKE_TARGET}\n",\r
                  module.name.c_str (),\r
                  isoboot.c_str (),\r

-                 GetDirectoryDependency ( PassThruCacheDirectory ( bootcdReactos ) ).c_str (),\r
+                 PassThruCacheDirectory ( bootcdReactos ).c_str (),\r

                  cdDirectories.c_str (),\r
                  cdFiles.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );\r
                  cdDirectories.c_str (),\r
                  cdFiles.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );\r

diff --git a/reactos/tools/rmkdir.c b/reactos/tools/rmkdir.c
index ecb3b31..b2120bb 100644 (file)
--- a/reactos/tools/rmkdir.c
+++ b/reactos/tools/rmkdir.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>

-#include <fcntl.h>

 #ifdef _MSC_VER
 #include <direct.h>
 #else
 #ifdef _MSC_VER
 #include <direct.h>
 #else


@@ -10,12 +9,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #endif

-#ifdef WIN32
-#include <sys/utime.h>
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif

 
 #if defined(WIN32)
 #define DIR_SEPARATOR_CHAR '\\'
 
 #if defined(WIN32)
 #define DIR_SEPARATOR_CHAR '\\'


@@ -31,7 +24,6 @@ char* convert_path(char* origpath)
 {
    char* newpath;
    int i;
 {
    char* newpath;
    int i;

-   int length;

    
    //newpath = strdup(origpath);
         newpath=malloc(strlen(origpath)+1);
    
    //newpath = strdup(origpath);
         newpath=malloc(strlen(origpath)+1);


@@ -55,13 +47,6 @@ char* convert_path(char* origpath)
 #endif 
        i++;
      }
 #endif 
        i++;
      }

-
-   length = strlen(newpath);
-   if (length > 0)
-     {
-        if (newpath[length - 1] == DIR_SEPARATOR_CHAR)
-          newpath[length - 1] = 0;
-     }

    return(newpath);
 }
 
    return(newpath);
 }
 


@@ -95,43 +80,6 @@ int mkdir_p(char* path)
    return(0);
 }
 
    return(0);
 }
 

-int
-write_created_file()
-{
-   char filename[256];
-   int id;
-#ifdef WIN32
-   time_t now;
-   struct utimbuf fnow;
-#endif
-
-   strcpy(filename, ".created");
-
-  id = open(filename, S_IWRITE, S_IRUSR | S_IWUSR);
-  if (id < 0)
-    {
-      id = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
-      if (id < 0)
-        {
-          fprintf(stderr, "Cannot create file %s.\n", filename);
-          return(1);
-        }
-    }
-
-  close(id);
-
-#ifdef WIN32
-  now = time(NULL);
-  fnow.actime = now;
-  fnow.modtime = now;
-  (int) utime(filename, &fnow);
-#else
-  (int) utimes(filename, NULL);
-#endif
-   
-   return 0;
-}
-

 int main(int argc, char* argv[])
 {
    char* path1;
 int main(int argc, char* argv[])
 {
    char* path1;


@@ -165,10 +113,9 @@ int main(int argc, char* argv[])
    
    while (csec != NULL)
      {
    
    while (csec != NULL)
      {

-       if (mkdir_p(csec) > 0)
-    exit(1);
+       mkdir_p(csec);

        csec = strtok(NULL, DIR_SEPARATOR_STRING);
      }
        csec = strtok(NULL, DIR_SEPARATOR_STRING);
      }

-
-   exit(write_created_file());
+   
+   exit(0);

 }
 }

diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index c59592c..23581e7 100644 (file)
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -1,7 +1,3 @@
-# We have to put rmkdir in $(INTERMEDIATE) and not $(INTERMEDIATE)tools
-# since GNU make will always remake directory targets and we can't do the
-# .created file trick for rmkdir due to circular dependencies
-

 RMKDIR_BASE = tools
 
 RMKDIR_TARGET = \
 RMKDIR_BASE = tools
 
 RMKDIR_TARGET = \


@@ -17,11 +13,11 @@ RMKDIR_HOST_CFLAGS = -g -Werror -Wall
 
 RMKDIR_HOST_LFLAGS = -g
 
 
 RMKDIR_HOST_LFLAGS = -g
 

-$(RMKDIR_TARGET): $(RMKDIR_OBJECTS)
+$(RMKDIR_TARGET): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_OBJECTS)

        $(ECHO_LD)
        ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
 
        $(ECHO_LD)
        ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
 

-$(INTERMEDIATE)rmkdir.o: $(RMKDIR_BASE)$(SEP)rmkdir.c
+$(INTERMEDIATE)rmkdir.o: $(INTERMEDIATE_NO_SLASH) $(RMKDIR_BASE)$(SEP)rmkdir.c

        $(ECHO_CC)
        ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o
 
        $(ECHO_CC)
        ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o
 


@@ -59,7 +55,9 @@ rsym_clean:
        -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL)
 clean: rsym_clean
 
        -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL)
 clean: rsym_clean
 

+include tools/bin2res/bin2res.mak

 include tools/buildno/buildno.mak
 include tools/buildno/buildno.mak

+include tools/cabman/cabman.mak

 include tools/cdmake/cdmake.mak
 include tools/nci/nci.mak
 include tools/rbuild/rbuild.mak
 include tools/cdmake/cdmake.mak
 include tools/nci/nci.mak
 include tools/rbuild/rbuild.mak


@@ -68,3 +66,4 @@ include tools/winebuild/winebuild.mak
 include tools/wmc/wmc.mak
 include tools/wpp/wpp.mak
 include tools/wrc/wrc.mak
 include tools/wmc/wmc.mak
 include tools/wpp/wpp.mak
 include tools/wrc/wrc.mak

+include lib/zlib/zlib.mak

diff --git a/reactos/tools/tools.xml b/reactos/tools/tools.xml
deleted file mode 100644 (file)
index 133bb90..0000000
--- a/reactos/tools/tools.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<directory name="bin2res">\r
-       <xi:include href="bin2res/bin2res.xml" />\r
-</directory>\r
-<directory name="cabman">\r
-       <xi:include href="cabman/cabman.xml" />\r
-</directory>\r

diff --git a/reactos/tools/unicode/unicode.mak b/reactos/tools/unicode/unicode.mak
index 70c124e..15646d7 100644 (file)
--- a/reactos/tools/unicode/unicode.mak
+++ b/reactos/tools/unicode/unicode.mak
@@ -1,8 +1,8 @@
 UNICODE_BASE = tools$(SEP)unicode
 
 UNICODE_BASE = tools$(SEP)unicode
 

-UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)$(CREATED)
+UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE)

 
 

-$(UNICODE_BASE_DIR): $(RMKDIR_TARGET)
+$(UNICODE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)

        ${mkdir} $(INTERMEDIATE)$(UNICODE_BASE)
 
 UNICODE_TARGET = \
        ${mkdir} $(INTERMEDIATE)$(UNICODE_BASE)
 
 UNICODE_TARGET = \

diff --git a/reactos/tools/winebuild/winebuild.mak b/reactos/tools/winebuild/winebuild.mak
index 24bbacb..dbf4792 100644 (file)
--- a/reactos/tools/winebuild/winebuild.mak
+++ b/reactos/tools/winebuild/winebuild.mak
@@ -1,8 +1,8 @@
 WINEBUILD_BASE = tools$(SEP)winebuild\r
 \r
 WINEBUILD_BASE = tools$(SEP)winebuild\r
 \r

-WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)$(CREATED)\r
+WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)\r

 \r
 \r

-$(WINEBUILD_BASE_DIR): $(RMKDIR_TARGET)\r
+$(WINEBUILD_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)\r

        ${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE)\r
 \r
 WINEBUILD_TARGET = \\r
        ${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE)\r
 \r
 WINEBUILD_TARGET = \\r

diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index 3609147..2bc87a2 100644 (file)
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -1,8 +1,8 @@
 WMC_BASE = tools$(SEP)wmc
 
 WMC_BASE = tools$(SEP)wmc
 

-WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE)$(SEP)$(CREATED)
+WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE)

 
 

-$(WMC_BASE_DIR): $(RMKDIR_TARGET)
+$(WMC_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)

        ${mkdir} $(INTERMEDIATE)$(WMC_BASE)
 
 WMC_TARGET = \
        ${mkdir} $(INTERMEDIATE)$(WMC_BASE)
 
 WMC_TARGET = \

diff --git a/reactos/tools/wpp/wpp.mak b/reactos/tools/wpp/wpp.mak
index 7dc8c0a..91775c0 100644 (file)
--- a/reactos/tools/wpp/wpp.mak
+++ b/reactos/tools/wpp/wpp.mak
@@ -1,6 +1,6 @@
 WPP_BASE = tools$(SEP)wpp
 
 WPP_BASE = tools$(SEP)wpp
 

-$(INTERMEDIATE)$(WPP_BASE): $(RMKDIR_TARGET)
+$(INTERMEDIATE)$(WPP_BASE): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)

        ${mkdir} $(INTERMEDIATE)$(WPP_BASE)
 
 WPP_TARGET = \
        ${mkdir} $(INTERMEDIATE)$(WPP_BASE)
 
 WPP_TARGET = \

diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak
index b92e4c0..c9c6511 100644 (file)
--- a/reactos/tools/wrc/wrc.mak
+++ b/reactos/tools/wrc/wrc.mak
@@ -1,11 +1,11 @@
 WRC_BASE = tools$(SEP)wrc
 
 WRC_BASE = tools$(SEP)wrc
 

-WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)$(CREATED)
+WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE)

 
 

-$(WRC_BASE_DIR): $(RMKDIR_TARGET)
+$(WRC_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET)

        ${mkdir} $(INTERMEDIATE)$(WRC_BASE)
 
        ${mkdir} $(INTERMEDIATE)$(WRC_BASE)
 

-WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port$(SEP)$(CREATED)
+WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port

 
 $(WRC_BASE_PORT_DIR): $(RMKDIR_TARGET) $(WRC_BASE_DIR)
        ${mkdir} $(INTERMEDIATE)$(WRC_BASE)$(SEP)port
 
 $(WRC_BASE_PORT_DIR): $(RMKDIR_TARGET) $(WRC_BASE_DIR)
        ${mkdir} $(INTERMEDIATE)$(WRC_BASE)$(SEP)port