Handle NULL flags argument in wxOSX wxNotebook::HitTest().

[wxWidgets.git] / samples / console / Makefile.in

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 0e3a2dd2796565523e9d5e3fb38531bb9f904b45..13f5a64a1bcf60fcafdaacffd24d497f14e760b3 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.9 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -9,6 +9,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@

+datarootdir = @datarootdir@

 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 SETFILE = @SETFILE@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 SETFILE = @SETFILE@


@@ -25,11 +26,11 @@ TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@

-EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
+EXTRALIBS_XML = @EXTRALIBS_XML@

 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@

+CXXWARNINGS = @CXXWARNINGS@

 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@

-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@

 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###


@@ -37,9 +38,10 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 2.9
 LIBDIRNAME = $(wx_top_builddir)/lib
 DESTDIR = 
 WX_RELEASE = 2.9
 LIBDIRNAME = $(wx_top_builddir)/lib

-CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

-       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)

 CONSOLE_OBJECTS =  \
        console_console.o
 
 CONSOLE_OBJECTS =  \
        console_console.o
 


@@ -50,15 +52,17 @@ CONSOLE_OBJECTS =  \
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon

-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_BUILD_debug@WXDEBUGFLAG = d

 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)

-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+@COND_MONOLITHIC_1@    $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+@COND_PLATFORM_MAC_0@__console___mac_setfilecmd = @true

 @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL console$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL console$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0

 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS


@@ -66,30 +70,29 @@ CONSOLE_OBJECTS =  \
 COND_MONOLITHIC_0___WXLIB_NET_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
 COND_MONOLITHIC_0___WXLIB_NET_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)

-COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0_USE_ODBC_1@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p)

 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)

-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \

        -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
        -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: console$(EXEEXT) data
+all: console$(EXEEXT)

 
 

-install: all
+install: 

 
 uninstall: 
 
 
 uninstall: 
 


@@ -104,28 +107,15 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 console$(EXEEXT): $(CONSOLE_OBJECTS)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 console$(EXEEXT): $(CONSOLE_OBJECTS)

-       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CONSOLE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

        
        $(__console___mac_setfilecmd)
        
        $(__console___mac_setfilecmd)

-       $(SAMPLES_RPATH_POSTLINK)
-
-data: 
-       @mkdir -p .
-       @for f in testdata.fc; do \
-       if test ! -f ./$$f -a ! -d ./$$f ; \
-       then x=yep ; \
-       else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
-       fi; \
-       case "$$x" in ?*) \
-       cp -pRf $(srcdir)/$$f . ;; \
-       esac; \
-       done

 
 console_console.o: $(srcdir)/console.cpp
        $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $(srcdir)/console.cpp
 
 
 # Include dependency info, if present:
 
 console_console.o: $(srcdir)/console.cpp
        $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $(srcdir)/console.cpp
 
 
 # Include dependency info, if present:

-@IF_GNU_MAKE@-include .deps/*.d
+@IF_GNU_MAKE@-include ./.deps/*.d

 
 

-.PHONY: all install uninstall clean distclean data
+.PHONY: all install uninstall clean distclean