CVS: winex Make.rules.in,1.20,1.21

Subject: winex Make.rules.in,1.20,1.21Update of /var/lib/cvsd/cvsroot/winex
In directory agravaine:/tmp/cvs-serv14364

Modified Files:
	Make.rules.in 
Log Message:
Changed all our makefiles to separate out our usage of @DLLFLAGS@. A new
DLLFLAGS makefile variable has been added, initialized with @DLLFLAGS@
in the individual makefiles. All existing usage of @DLLFLAGS@ has been
replaced with $(DLLFLAGS), and most importantly, @DLLFLAGS@ is no longer
included in any makefile's DEFS variable. Instead, $(DLLFLAGS) is included
directly into ALLCFLAGS. DEFS should only contain preprocessor definitions,
nothing else, so that it can be used by other tools with a preprocessor
(widl).


Index: Make.rules.in
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/Make.rules.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Make.rules.in	14 Dec 2007 20:12:27 -0000	1.20
+++ Make.rules.in	14 Dec 2007 20:12:43 -0000	1.21
@@ -53,7 +53,7 @@
 RANLIB    = @RANLIB@
 LN_S      = @LN_S@
 DIVINCL   = $(EXTRAPREINCL) -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
-ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
+ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(EXTRA_CFLAGS) $(DLLFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
 LDCOMBINE = @LDCOMBINE@
 LDFLAGS   = @LDFLAGS@
 STRIP_OPTION = @STRIP_OPTION@
@@ -175,13 +175,13 @@
 	$(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
 
 .spec.spec.c:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) -o $@ -spec $<
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L$(DLLDIR) -o $@ -spec $<
 
 .spec.spec.def:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) -o $@ -def $<
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L$(DLLDIR) -o $@ -def $<
 
 .c.glue.c:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -o $@ -glue $<
 
 .c.ln:
 	$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
@@ -220,7 +220,7 @@
 # Rule for main module spec file
 
 $(MODULE).spec.c: $(MODULE).spec $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MODULE).spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L$(DLLDIR) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MODULE).spec
 
 # Rule to rebuild the resource compiler
 
@@ -346,7 +346,7 @@
 	-$(STRIP) $(STRIP_OPTION) $@
 
 $(TESTPROGRAM).spec.c: $(TESTPROGRAM).spec $(TESTPROGRAM).tmp.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) -sym $(TESTPROGRAM).tmp.o -o $@ -spec $(SRCDIR)/$(TESTPROGRAM).spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L$(DLLDIR) -sym $(TESTPROGRAM).tmp.o -o $@ -spec $(SRCDIR)/$(TESTPROGRAM).spec
 
 # Misc. rules