From f8bac62769b73e970209795d530756f429b49ed5 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 9 Jan 2003 01:57:15 +0000 Subject: [PATCH] Do not define __WINESRC__ when building tools and miscemu. --- Make.rules.in | 4 ++-- miscemu/Makefile.in | 1 - miscemu/main.c | 10 +++++----- tools/widl/Makefile.in | 1 - tools/winapi/Makefile.in | 1 - tools/winebuild/Makefile.in | 1 - tools/winedump/Makefile.in | 1 - tools/wmc/Makefile.in | 1 - tools/wpp/Makefile.in | 1 - tools/wrc/Makefile.in | 2 +- 10 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 07bd2389c06..68dd595514b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -172,13 +172,13 @@ $(SUBDIRS:%=%/__man__): dummy cd `dirname $@` && $(MAKE) man man: $(C_SRCS) $(SUBDIRS:%=%/__man__) - if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi + if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) $(MANSPECS) $$i; done; fi $(SUBDIRS:%=%/__doc_html__): dummy cd `dirname $@` && $(MAKE) doc-html doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__) - if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi + if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) $(MANSPECS) $$i; done; fi .PHONY: man doc-html $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) diff --git a/miscemu/Makefile.in b/miscemu/Makefile.in index 8f590ef471f..d2119d844a8 100644 --- a/miscemu/Makefile.in +++ b/miscemu/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ diff --git a/miscemu/main.c b/miscemu/main.c index f4c722c372d..14f983bf0bd 100644 --- a/miscemu/main.c +++ b/miscemu/main.c @@ -62,12 +62,12 @@ int WINAPI wine_initial_task( HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, INT instance = GetLastError(); } - MESSAGE( "%s: can't exec '%s': ", argv0, GetCommandLineA() ); + WINE_MESSAGE( "%s: can't exec '%s': ", argv0, GetCommandLineA() ); switch (instance) { - case 2: MESSAGE("file not found\n" ); break; - case 11: MESSAGE("invalid exe file\n" ); break; - default: MESSAGE("error=%d\n", instance ); break; + case 2: WINE_MESSAGE("file not found\n" ); break; + case 11: WINE_MESSAGE("invalid exe file\n" ); break; + default: WINE_MESSAGE("error=%d\n", instance ); break; } ExitProcess(instance); } @@ -77,7 +77,7 @@ int WINAPI wine_initial_task( HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, INT if (!(user32 = LoadLibraryA( "user32.dll" ))) { - MESSAGE( "Cannot load user32.dll\n" ); + WINE_MESSAGE( "Cannot load user32.dll\n" ); ExitProcess( GetLastError() ); } pGetMessageA = (void *)GetProcAddress( user32, "GetMessageA" ); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 4379f1cffc4..042d69687c3 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/tools/winapi/Makefile.in b/tools/winapi/Makefile.in index 518c3a6a28a..ff952d9057f 100644 --- a/tools/winapi/Makefile.in +++ b/tools/winapi/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 04618d174fe..4ca78c4fa3e 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index be7534a9bee..4c3c0fb4b80 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index e47a573117a..2ccbaa48e9a 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/tools/wpp/Makefile.in b/tools/wpp/Makefile.in index 0b5a0edadb8..311ac22e770 100644 --- a/tools/wpp/Makefile.in +++ b/tools/wpp/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 30e14550548..552b8d84a20 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,4 +1,4 @@ -DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" +DEFS = -DDINCLUDEDIR="\"$(includedir)\"" TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@