Alexandre Julliard : makefiles: Define __WINESRC__ globally.
Alexandre Julliard
julliard at winehq.org
Mon Oct 7 14:17:10 CDT 2013
Module: wine
Branch: master
Commit: 8d5b8b13460df0eb3c2cec898e9ea1789276f0d0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5b8b13460df0eb3c2cec898e9ea1789276f0d0
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Oct 5 20:58:24 2013 +0200
makefiles: Define __WINESRC__ globally.
---
Make.rules.in | 1 +
Maketest.rules.in | 2 --
dlls/Makedll.rules.in | 1 -
dlls/Makeimplib.rules.in | 1 -
libs/port/Makefile.in | 1 -
libs/wine/Makefile.in | 2 +-
loader/Makefile.in | 1 -
programs/Makeprog.rules.in | 1 -
server/Makefile.in | 1 -
tools/Makefile.in | 2 +-
tools/widl/Makefile.in | 2 --
tools/winebuild/Makefile.in | 2 --
tools/winedump/Makefile.in | 2 --
tools/winegcc/Makefile.in | 2 +-
tools/wmc/Makefile.in | 2 +-
tools/wrc/Makefile.in | 2 +-
16 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 130abbd..fd7166f 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -14,6 +14,7 @@
# First some useful definitions
INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL)
+DEFS = -D__WINESRC__ $(EXTRADEFS)
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
diff --git a/Maketest.rules.in b/Maketest.rules.in
index 56174d8..7ba3060 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -9,8 +9,6 @@
#
DLLFLAGS = @DLLFLAGS@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
-
MODULE = $(TESTDLL:%.dll=%)_test.exe
TESTRESULTS = $(C_SRCS:.c=.ok)
TESTPROGRAM = $(MODULE)$(DLLEXT)
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index b34a35a..dba64f6 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -8,7 +8,6 @@
#
DLLFLAGS = @DLLFLAGS@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
BASEMODULE = $(MODULE:%.dll=%)
MAINSPEC = $(BASEMODULE).spec
ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in
index 0a22784..5112948 100644
--- a/dlls/Makeimplib.rules.in
+++ b/dlls/Makeimplib.rules.in
@@ -7,7 +7,6 @@
#
DLLFLAGS = @DLLFLAGS@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
MAKEDEPFLAGS = -xo -xcross.o
@MAKE_RULES@
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 79bd1fe..3f42fd4 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -1,4 +1,3 @@
-DEFS = -D__WINESRC__
DLLFLAGS = @DLLFLAGS@
MODULE = libwine_port.a
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index be5351e..ad9c3c9 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -1,6 +1,6 @@
DLLFLAGS = @DLLFLAGS@
EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@
-DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
+EXTRADEFS = -DWINE_UNICODE_API=""
VERSION = 1.0
SOVERSION = 1
diff --git a/loader/Makefile.in b/loader/Makefile.in
index a7859b2..9b0436a 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -1,4 +1,3 @@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
MODCFLAGS = @BUILTINFLAG@
C_SRCS = \
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 9c2cb4b..f72ad2e 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -10,7 +10,6 @@
#
DLLFLAGS = @DLLFLAGS@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
diff --git a/server/Makefile.in b/server/Makefile.in
index 2e9bba1..38e79bc 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,4 +1,3 @@
-DEFS = -D__WINESRC__
EXTRALIBS = @LIBPOLL@ @LIBRT@
C_SRCS = \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 91446d6..02feee9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
+EXTRADEFS = -DWINE_UNICODE_API=""
EXTRAINCL = @FREETYPE_CFLAGS@
FREETYPELIBS = @FREETYPE_LIBS@
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 4bbcf1e..f12916d 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -1,5 +1,3 @@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
-
PROGRAMS = widl$(EXEEXT)
MANPAGE = widl.man
diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
index 96bc4f9..190caf3 100644
--- a/tools/winebuild/Makefile.in
+++ b/tools/winebuild/Makefile.in
@@ -1,5 +1,3 @@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
-
PROGRAMS = winebuild$(EXEEXT)
MANPAGE = winebuild.man
diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in
index ce61682..e8a6ba3 100644
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@ -1,5 +1,3 @@
-DEFS = -D__WINESRC__ $(EXTRADEFS)
-
PROGRAMS = winedump$(EXEEXT)
MANPAGE = winedump.man
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index 3e8bfdd..dce7ae2 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -1,4 +1,4 @@
-DEFS = \
+EXTRADEFS = \
-DINCLUDEDIR="\"$(includedir)\"" \
-DDLLDIR="\"$(dlldir)\"" \
-DLIBDIR="\"$(libdir)\"" \
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index 324ab51..c302c22 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -1,4 +1,4 @@
-DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
+EXTRADEFS = -DWINE_UNICODE_API=""
PROGRAMS = wmc$(EXEEXT)
MANPAGE = wmc.man
ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT)
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 2ed0453..a017891 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -1,4 +1,4 @@
-DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API=""
+EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API=""
PROGRAMS = wrc$(EXEEXT)
MANPAGE = wrc.man
ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)
More information about the wine-cvs
mailing list