[ros-diffs] [hpoussin] 29177: Use user flags when building host tools

Author: hpoussin
Date: Mon Sep 24 15:28:52 2007
New Revision: 29177

URL: http://svn.reactos.org/svn/reactos?rev=29177&view=rev
Log:
Use user flags when building host tools

Modified:
    trunk/reactos/lib/3rdparty/zlib/zlib.mak
    trunk/reactos/lib/cmlib/cmlib.mak
    trunk/reactos/lib/inflib/inflib.mak
    trunk/reactos/tools/cabman/cabman.mak
    trunk/reactos/tools/mkhive/mkhive.mak
    trunk/reactos/tools/tools.mak
    trunk/reactos/tools/widl/widl.mak

Modified: trunk/reactos/lib/3rdparty/zlib/zlib.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.mak…
==============================================================================
--- trunk/reactos/lib/3rdparty/zlib/zlib.mak (original)
+++ trunk/reactos/lib/3rdparty/zlib/zlib.mak Mon Sep 24 15:28:52 2007
@@ -33,7 +33,7 @@
 	$(addprefix $(INTERMEDIATE_), $(ZLIB_HOST_SOURCES:.c=.host.o))
 
 ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-  -Wstrict-prototypes -Wmissing-prototypes
+  -Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS)
 
 $(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) | $(ZLIB_OUT)
 	$(ECHO_AR)

Modified: trunk/reactos/lib/cmlib/cmlib.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=29…
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.mak (original)
+++ trunk/reactos/lib/cmlib/cmlib.mak Mon Sep 24 15:28:52 2007
@@ -32,7 +32,7 @@
 
 CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \
   -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \
-  -DCMLIB_HOST
+  -DCMLIB_HOST $(HOST_CFLAGS)
 
 $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)
 	$(ECHO_AR)

Modified: trunk/reactos/lib/inflib/inflib.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=…
==============================================================================
--- trunk/reactos/lib/inflib/inflib.mak (original)
+++ trunk/reactos/lib/inflib/inflib.mak Mon Sep 24 15:28:52 2007
@@ -32,7 +32,7 @@
 
 INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
   -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
-  -Iinclude/reactos -Iinclude
+  -Iinclude/reactos -Iinclude $(HOST_CFLAGS)
 
 $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
 	$(ECHO_AR)

Modified: trunk/reactos/tools/cabman/cabman.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.mak?re…
==============================================================================
--- trunk/reactos/tools/cabman/cabman.mak (original)
+++ trunk/reactos/tools/cabman/cabman.mak Mon Sep 24 15:28:52 2007
@@ -29,7 +29,7 @@
 CABMAN_OBJECTS = \
   $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o))
 
-CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CXXFLAGS)
+CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CPPFLAGS)
 
 CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET)
 

Modified: trunk/reactos/tools/mkhive/mkhive.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re…
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.mak (original)
+++ trunk/reactos/tools/mkhive/mkhive.mak Mon Sep 24 15:28:52 2007
@@ -30,10 +30,10 @@
 MKHIVE_OBJECTS = \
 	$(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o))
 
-MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
-  -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3
+MKHIVE_HOST_CFLAGS = -fshort-wchar -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
+  -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 $(HOST_CFLAGS)
 
-MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3
+MKHIVE_HOST_LFLAGS = $(TOOLS_LFLAGS) -g3
 
 .PHONY: mkhive
 mkhive: $(MKHIVE_TARGET)

Modified: trunk/reactos/tools/tools.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29177&…
==============================================================================
--- trunk/reactos/tools/tools.mak (original)
+++ trunk/reactos/tools/tools.mak Mon Sep 24 15:28:52 2007
@@ -5,8 +5,8 @@
 TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE)
 TOOLS_OUT_ = $(TOOLS_OUT)$(SEP)
 
-TOOLS_CFLAGS = $(HOST_CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing
-TOOLS_CPPFLAGS = $(HOST_CPPFLAGS) -Wall -Wpointer-arith
+TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS)
+TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS)
 TOOLS_LFLAGS = $(HOST_LFLAGS)
 
 # HACK: Remove those lines once host tools don't use target headers anymore

Modified: trunk/reactos/tools/widl/widl.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=29…
==============================================================================
--- trunk/reactos/tools/widl/widl.mak (original)
+++ trunk/reactos/tools/widl/widl.mak Mon Sep 24 15:28:52 2007
@@ -56,11 +56,11 @@
 WIDL_OBJECTS = \
   $(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=.o))
 
-WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \
+WIDL_HOST_CFLAGS = \
 	-DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \
 	-I$(WIDL_BASE) -I$(WPP_BASE) \
 	-Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \
-	-I$(INTERMEDIATE_)include
+	-I$(INTERMEDIATE_)include $(TOOLS_CFLAGS)
 
 WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)