CVS: winex/programs/avitools Makefile.in, 1.1.1.5, 1.2
[email protected] 14 Dec 2007 20:15:37 -0000
| Newsgroups | gmane.comp.emulators.winex.cvs |
|---|---|
| Message-ID | <[email protected]> |
Subject: winex/programs/avitools Makefile.in,1.1.1.5,1.2Update of /var/lib/cvsd/cvsroot/winex/programs/avitools In directory agravaine:/tmp/cvs-serv15164/programs/avitools 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/programs/avitools/Makefile.in,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -d -r1.1.1.5 -r1.2 --- Makefile.in 31 Dec 2001 10:52:15 -0000 1.1.1.5 +++ Makefile.in 14 Dec 2007 20:15:35 -0000 1.2 @@ -1,4 +1,5 @@ -DEFS = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT +DLLFLAGS = @DLLFLAGS@ +DEFS = -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT LDDLLFLAGS = @LDDLLFLAGS@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. @@ -18,13 +19,13 @@ @MAKE_RULES@ aviinfo.spec.c: aviinfo.spec aviinfo.o $(WINEBUILD) - $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym aviinfo.o -o aviinfo.spec.c -spec $(SRCDIR)/aviinfo.spec + $(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym aviinfo.o -o aviinfo.spec.c -spec $(SRCDIR)/aviinfo.spec aviplay.spec.c: aviplay.spec aviplay.o $(WINEBUILD) - $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym aviplay.o -o aviplay.spec.c -spec $(SRCDIR)/aviplay.spec + $(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym aviplay.o -o aviplay.spec.c -spec $(SRCDIR)/aviplay.spec icinfo.spec.c: icinfo.spec icinfo.o $(WINEBUILD) - $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym icinfo.o -o icinfo.spec.c -spec $(SRCDIR)/icinfo.spec + $(LDPATH) $(WINEBUILD) $(DLLFLAGS) -L $(DLLDIR) -sym icinfo.o -o icinfo.spec.c -spec $(SRCDIR)/icinfo.spec aviinfo.so: aviinfo.o aviinfo.spec.o $(LDSHARED) $(LDDLLFLAGS) -o aviinfo.so aviinfo.o aviinfo.spec.o $(ALL_LIBS)