commit fc09423d3dbdc98595c9b38a6b0b3b71fa79850c
author Alexandre Julliard <julliard@winehq.org> Mon Apr 14 21:46:41 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 14 21:46:41 2003 +0000
tree 6a7af80028c80de81ef11ad2189a71b68aa172ef
parent 46adbecd13362cfa3b5602c517f7d5dff347035a

Allow overriding CFLAGS when running configure. Other small cleanups.

Make.rules.in

diff --git a/Make.rules.in b/Make.rules.in
index d82bd00..aa79a23 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -23,8 +23,7 @@
 SHELL     = /bin/sh
 CC        = @CC@
 CPP       = @CPP@
-CFLAGS    = @CFLAGS@ $(EXTRACFLAGS)
-OPTIONS   = @OPTIONS@ -D_REENTRANT
+CFLAGS    = @CFLAGS@
 LIBS      = @LIBS@
 YACC      = @YACC@
 LEX       = @LEX@
@@ -45,8 +44,6 @@
 LN        = @LN@
 LN_S      = @LN_S@
 TOOLSDIR  = @TOOLSDIR@
-DIVINCL   = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
-ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS)
 AS        = @AS@
 LD        = @LD@
 LDFLAGS   = @LDFLAGS@
@@ -56,8 +53,11 @@
 C2MAN     = @C2MAN@
 LINT      = @LINT@
 LINTFLAGS = @LINTFLAGS@
-ALLLINTFLAGS = $(LINTFLAGS) $(DEFS) $(OPTIONS) $(DIVINCL)
-MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs
+INCLUDES     = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
+EXTRACFLAGS  = @EXTRACFLAGS@
+ALLCFLAGS    = $(INCLUDES) $(DEFS) $(EXTRACFLAGS) $(CFLAGS)
+ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
+MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check
 WINEWRAPPER  = $(TOPSRCDIR)/tools/winewrapper
 RUNTEST      = $(TOPSRCDIR)/tools/runtest
@@ -66,7 +66,7 @@
 WRC          = $(TOOLSDIR)/tools/wrc/wrc
 WMC          = $(TOOLSDIR)/tools/wmc/wmc
 WIDL         = $(TOOLSDIR)/tools/widl/widl
-WRCFLAGS     = --nostdinc $(EXTRAWRCFLAGS)
+WRCFLAGS     = --nostdinc $(INCLUDES) $(EXTRAWRCFLAGS)
 LDPATH       = @LDPATH@
 DLLDIR       = $(TOPOBJDIR)/dlls
 LIBPORT      = -L$(TOPOBJDIR)/libs/port -lwine_port
@@ -120,7 +120,7 @@
 	$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
 
 .rc.res:
-	$(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ $<
+	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ $<
 
 .res.res.o:
 	$(WINDRES) -i $< -o $@
@@ -188,7 +188,7 @@
 	cd `dirname $@` && $(MAKE) depend
 
 depend: $(MAKEDEP) $(SUBDIRS:%=%/__depend__)
-	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS)
+	$(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS)
 
 .PHONY: depend $(SUBDIRS:%=%/__depend__)