ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a new DLLDEFS variable in configure/Makefiles to actually remove 

all the debug messages (minus ERRs) if the user decides so.
This commit is contained in:
Vincent Béron 2004-10-19 23:06:11 +00:00 committed by Alexandre Julliard
parent 9cfb943561
commit 1f504141b7
13 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1413,21 +1413,16 @@ then
WIN16_FILES="" WIN16_FILES=""
WIN16_INSTALL="" WIN16_INSTALL=""
fi fi
DLLDEFS=""
if test "x$enable_debug" = "xno" if test "x$enable_debug" = "xno"
then then
DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS"
cat >>confdefs.h <<\_ACEOF
#define NO_DEBUG_MSGS 1
_ACEOF
fi fi
if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno" if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno"
then then
DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS"
cat >>confdefs.h <<\_ACEOF
#define NO_TRACE_MSGS 1
_ACEOF
fi fi
@ -21037,6 +21032,7 @@ s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t s,@LIBS@,$LIBS,;t t
s,@WIN16_FILES@,$WIN16_FILES,;t t s,@WIN16_FILES@,$WIN16_FILES,;t t
s,@WIN16_INSTALL@,$WIN16_INSTALL,;t t s,@WIN16_INSTALL@,$WIN16_INSTALL,;t t
s,@DLLDEFS@,$DLLDEFS,;t t
s,@build@,$build,;t t s,@build@,$build,;t t
s,@build_cpu@,$build_cpu,;t t s,@build_cpu@,$build_cpu,;t t
s,@build_vendor@,$build_vendor,;t t s,@build_vendor@,$build_vendor,;t t

6
configure.ac
View File

@ -28,13 +28,15 @@ then
WIN16_FILES="" WIN16_FILES=""
WIN16_INSTALL="" WIN16_INSTALL=""
fi fi
AC_SUBST(DLLDEFS,"")
if test "x$enable_debug" = "xno" if test "x$enable_debug" = "xno"
then then
AC_DEFINE(NO_DEBUG_MSGS,1,[Define to disable all debug messages.]) DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS"
fi fi
if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno" if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno"
then then
AC_DEFINE(NO_TRACE_MSGS,1,[Define to disable trace messages.]) DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS"
fi fi
dnl **** Check for some programs **** dnl **** Check for some programs ****

3
dlls/Makedll.rules.in
View File

@ -9,9 +9,10 @@
# plus all variables required by the global Make.rules.in # plus all variables required by the global Make.rules.in
# #
DEFS = -D__WINESRC__ $(EXTRADEFS) DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DLLEXT = @DLLEXT@ DLLEXT = @DLLEXT@
DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS)
MAINSPEC = $(MODULE:%.dll=%).spec MAINSPEC = $(MODULE:%.dll=%).spec
SPEC_DEF = $(MAINSPEC).def SPEC_DEF = $(MAINSPEC).def
WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)

3
dlls/Maketest.rules.in
View File

@ -9,8 +9,9 @@
# plus all variables required by the global Make.rules.in # plus all variables required by the global Make.rules.in
# #
DEFS = $(EXTRADEFS) DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = $(DLLDEFS) $(EXTRADEFS)
MODULE = $(TESTDLL:%.dll=%)_test.exe MODULE = $(TESTDLL:%.dll=%)_test.exe
TESTLIST = testlist.c TESTLIST = testlist.c

3
dlls/dxerr8/Makefile.in
View File

@ -1,5 +1,6 @@
DEFS = -D__WINESRC__ DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -D__WINESRC__ $(DLLDEFS)
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

3
dlls/dxerr9/Makefile.in
View File

@ -1,5 +1,6 @@
DEFS = -D__WINESRC__ DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -D__WINESRC__ $(DLLDEFS)
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

3
dlls/dxguid/Makefile.in
View File

@ -1,5 +1,6 @@
DEFS = -D__WINESRC__ DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -D__WINESRC__ $(DLLDEFS)
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

3
dlls/strmiids/Makefile.in
View File

@ -1,5 +1,6 @@
DEFS = -D__WINESRC__ DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -D__WINESRC__ $(DLLDEFS)
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

3
dlls/uuid/Makefile.in
View File

@ -1,5 +1,6 @@
DEFS = -D__WINESRC__ DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = -D__WINESRC__ $(DLLDEFS)
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

6
include/config.h.in
View File

@ -860,12 +860,6 @@
/* Define if we have __va_copy */ /* Define if we have __va_copy */
#undef HAVE___VA_COPY #undef HAVE___VA_COPY
/* Define to disable all debug messages. */
#undef NO_DEBUG_MSGS
/* Define to disable trace messages. */
#undef NO_TRACE_MSGS
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT

12
include/wine/debug.h
View File

@ -45,13 +45,13 @@ enum __WINE_DEBUG_CLASS {
__WINE_DBCL_COUNT __WINE_DBCL_COUNT
}; };
#ifndef NO_TRACE_MSGS #ifndef WINE_NO_TRACE_MSGS
# define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)[0] & (1 << __WINE_DBCL_TRACE)) # define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)[0] & (1 << __WINE_DBCL_TRACE))
#else #else
# define __WINE_GET_DEBUGGING_TRACE(dbch) 0 # define __WINE_GET_DEBUGGING_TRACE(dbch) 0
#endif #endif
#ifndef NO_DEBUG_MSGS #ifndef WINE_NO_DEBUG_MSGS
# define __WINE_GET_DEBUGGING_WARN(dbch) ((dbch)[0] & (1 << __WINE_DBCL_WARN)) # define __WINE_GET_DEBUGGING_WARN(dbch) ((dbch)[0] & (1 << __WINE_DBCL_WARN))
# define __WINE_GET_DEBUGGING_FIXME(dbch) ((dbch)[0] & (1 << __WINE_DBCL_FIXME)) # define __WINE_GET_DEBUGGING_FIXME(dbch) ((dbch)[0] & (1 << __WINE_DBCL_FIXME))
#else #else
@ -80,12 +80,12 @@ enum __WINE_DEBUG_CLASS {
#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
#ifdef NO_TRACE_MSGS #ifdef WINE_NO_TRACE_MSGS
#define WINE_TRACE(args...) do { } while(0) #define WINE_TRACE(args...) do { } while(0)
#define WINE_TRACE_(ch) WINE_TRACE #define WINE_TRACE_(ch) WINE_TRACE
#endif #endif
#ifdef NO_DEBUG_MSGS #ifdef WINE_NO_DEBUG_MSGS
#define WINE_WARN(args...) do { } while(0) #define WINE_WARN(args...) do { } while(0)
#define WINE_WARN_(ch) WINE_WARN #define WINE_WARN_(ch) WINE_WARN
#define WINE_FIXME(args...) do { } while(0) #define WINE_FIXME(args...) do { } while(0)
@ -105,12 +105,12 @@ enum __WINE_DEBUG_CLASS {
#define __WINE_PRINTF_ATTR(fmt,args) #define __WINE_PRINTF_ATTR(fmt,args)
#ifdef NO_TRACE_MSGS #ifdef WINE_NO_TRACE_MSGS
#define WINE_TRACE(...) do { } while(0) #define WINE_TRACE(...) do { } while(0)
#define WINE_TRACE_(ch) WINE_TRACE #define WINE_TRACE_(ch) WINE_TRACE
#endif #endif
#ifdef NO_DEBUG_MSGS #ifdef WINE_NO_DEBUG_MSGS
#define WINE_WARN(...) do { } while(0) #define WINE_WARN(...) do { } while(0)
#define WINE_WARN_(ch) WINE_WARN #define WINE_WARN_(ch) WINE_WARN
#define WINE_FIXME(...) do { } while(0) #define WINE_FIXME(...) do { } while(0)

3
programs/Makeprog.rules.in
View File

@ -9,8 +9,9 @@
# plus all variables required by the global Make.rules.in # plus all variables required by the global Make.rules.in
# #
DEFS = $(EXTRADEFS) DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = $(DLLDEFS) $(EXTRADEFS)
ALL_OBJS = $(OBJS) $(MODULE).dbg.o ALL_OBJS = $(OBJS) $(MODULE).dbg.o
ALL_LIBS = $(IMPORTS:%=-l%) $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) ALL_LIBS = $(IMPORTS:%=-l%) $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
BASEMODULE = $(MODULE:.exe=) BASEMODULE = $(MODULE:.exe=)

3
programs/avitools/Makefile.in
View File

@ -1,5 +1,6 @@
DEFS = $(EXTRADEFS) DLLDEFS = @DLLDEFS@
DLLFLAGS = @DLLFLAGS@ DLLFLAGS = @DLLFLAGS@
DEFS = $(DLLDEFS) $(EXTRADEFS)
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@