diff --git a/Make.rules.in b/Make.rules.in index 130abbd3407..fd7166f4939 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 56174d8fba7..7ba3060d2d6 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 b34a35a0297..dba64f6c887 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 0a22784f3ec..51129485e06 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 79bd1fe9e08..3f42fd44165 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 be5351e3030..ad9c3c94e7f 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 a7859b28a85..9b0436aff14 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 9c2cb4b6143..f72ad2e1dba 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 2e9bba1fa82..38e79bcbdb0 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 91446d62bd7..02feee90d35 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 4bbcf1e0c18..f12916d0777 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 96bc4f92cb0..190caf31141 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 ce6168283a3..e8a6ba31e25 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 3e8bfdd9fa1..dce7ae26063 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 324ab5154f8..c302c22a719 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 2ed045359f7..a017891a418 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)