CVS: winex/libtest Makefile.in,1.1.1.4,1.2

Subject: winex/libtest Makefile.in,1.1.1.4,1.2Update of /var/lib/cvsd/cvsroot/winex/libtest
In directory agravaine:/tmp/cvs-serv14791/libtest

Modified Files:
	Makefile.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: Makefile.in
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/libtest/Makefile.in,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -d -r1.1.1.4 -r1.2
--- Makefile.in	16 Jan 2002 19:06:06 -0000	1.1.1.4
+++ Makefile.in	14 Dec 2007 20:14:18 -0000	1.2
@@ -1,4 +1,5 @@
-DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT
+DLLFLAGS   = @DLLFLAGS@
+DEFS       = -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT
 LDDLLFLAGS = @LDDLLFLAGS@
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ..
@@ -40,52 +41,52 @@
 @MAKE_RULES@
 
 expand.spec.c: expand.spec expand.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym expand.o -o expand.spec.c -spec expand.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym expand.o -o expand.spec.c -spec expand.spec
 expand.so: expand.o expand.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o expand.so $+ $(ALL_LIBS)
 
 hello.spec.c: hello.spec hello.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym hello.o -o hello.spec.c -spec hello.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym hello.o -o hello.spec.c -spec hello.spec
 hello.so: hello.o hello.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello.so $+ $(ALL_LIBS)
 
 hello2.spec.c: hello2.spec hello2.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym hello2.o -o hello2.spec.c -spec hello2.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym hello2.o -o hello2.spec.c -spec hello2.spec
 hello2.so: hello2.o hello2.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello2.so $+ $(ALL_LIBS)
 
 hello3.spec.c: hello3.spec hello3.o hello3res.res $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym hello3.o -o hello3.spec.c -spec hello3.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym hello3.o -o hello3.spec.c -spec hello3.spec
 hello3.so: hello3.o hello3.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello3.so $+ $(ALL_LIBS)
 
 hello4.spec.c: hello4.spec hello4.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym hello4.o -o hello4.spec.c -spec hello4.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym hello4.o -o hello4.spec.c -spec hello4.spec
 hello4.so: hello4.o hello4.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello4.so $+ $(ALL_LIBS)
 
 hello5.spec.c: hello5.spec hello5.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym hello5.o -o hello5.spec.c -spec hello5.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym hello5.o -o hello5.spec.c -spec hello5.spec
 hello5.so: hello5.o hello5.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o hello5.so $+ $(ALL_LIBS)
 
 new.spec.c: new.spec new.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym new.o -o new.spec.c -spec new.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym new.o -o new.spec.c -spec new.spec
 new.so: new.o new.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o new.so $+ $(ALL_LIBS)
 
 rolex.spec.c: rolex.spec rolex.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym rolex.o -o rolex.spec.c -spec rolex.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym rolex.o -o rolex.spec.c -spec rolex.spec
 rolex.so: rolex.o rolex.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o rolex.so $+ $(ALL_LIBS)
 
 vartest.spec.c: vartest.spec vartest.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym vartest.o -o vartest.spec.c -spec vartest.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym vartest.o -o vartest.spec.c -spec vartest.spec
 vartest.so: vartest.o vartest.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o vartest.so $+ $(ALL_LIBS)
 
 volinfo.spec.c: volinfo.spec volinfo.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym volinfo.o -o volinfo.spec.c -spec volinfo.spec
+	$(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym volinfo.o -o volinfo.spec.c -spec volinfo.spec
 volinfo.so: volinfo.o volinfo.spec.o
 	$(LDSHARED) $(LDDLLFLAGS) -o volinfo.so $+ $(ALL_LIBS)