wxMediaCtrl patch from Ryan:

[wxWidgets.git] / demos / dbbrowse / Makefile.in

diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in
index 43eab135fe3d811108eb2d3bfb24952c57582af3..0a01f234feb2fd88a764b7eb16a613da56c6cd93 100644 (file)
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)

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


@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_ODBC = @EXTRALIBS_ODBC@


@@ -39,11 +38,12 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).3
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).2

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 DBBROWSE_OBJECTS =  \
        $(__dbbrowse_os2_lib_res) \
        dbbrowse_dbbrowse.o \
 DBBROWSE_OBJECTS =  \
        $(__dbbrowse_os2_lib_res) \
        dbbrowse_dbbrowse.o \


@@ -68,12 +68,26 @@ DBBROWSE_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @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_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_USE_ODBC_1@__dbbrowse___depname = dbbrowse$(EXEEXT)

 @COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbbrowse$(EXEEXT)
 @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbbrowse$(EXEEXT)
 @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS

 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL


@@ -128,14 +142,15 @@ 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_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \

-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
+       $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \

        $(srcdir)/../../samples -i $(top_srcdir)/include -o dbbrowse$(EXEEXT) \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o dbbrowse$(EXEEXT) \

-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+       Carbon.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 

-all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname) data_help_std data_help_png
+all: $(__dbbrowse___depname) $(__dbbrowse_bundle___depname) data_help_std data_help_png

 
 install: all
 
 
 install: all
 


@@ -150,16 +165,16 @@ clean:
        rm -rf dbbrowse.app
 
 distclean: clean
        rm -rf dbbrowse.app
 
 distclean: clean

-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile

 
 

-dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
-       $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
-       $(__dbbrowse___mac_rezcmd)
-       $(__dbbrowse___mac_setfilecmd)
-       $(__dbbrowse___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_ODBC_1@dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
+@COND_USE_ODBC_1@      $(__dbbrowse___mac_rezcmd)
+@COND_USE_ODBC_1@      $(__dbbrowse___mac_setfilecmd)
+@COND_USE_ODBC_1@      $(__dbbrowse___os2_emxbindcmd)
+@COND_USE_ODBC_1@      $(SAMPLES_RPATH_POSTLINK)

 
 

-dbbrowse.app/Contents/PkgInfo: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+dbbrowse.app/Contents/PkgInfo: $(__dbbrowse___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p dbbrowse.app/Contents
        mkdir -p dbbrowse.app/Contents/MacOS
        mkdir -p dbbrowse.app/Contents/Resources
        mkdir -p dbbrowse.app/Contents
        mkdir -p dbbrowse.app/Contents/MacOS
        mkdir -p dbbrowse.app/Contents/Resources


@@ -177,7 +192,6 @@ dbbrowse.app/Contents/PkgInfo: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse
        
        
        ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse
        
        

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dbbrowse_bundle: $(____dbbrowse_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dbbrowse_bundle: $(____dbbrowse_BUNDLE_TGT_REF_DEP)


@@ -185,45 +199,53 @@ dbbrowse.app/Contents/PkgInfo: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 data_help_std: 
        @mkdir -p ./help.std
        @for f in compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm; do \
 data_help_std: 
        @mkdir -p ./help.std
        @for f in compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm; do \

-       if test \( ! -s ./help.std/$$f \) -o \( $(srcdir)/help.std/$$f -nt ./help.std/$$f  \) ; then \
-       cp -pRf $(srcdir)/help.std/$$f ./help.std ; \
+       if test ! -f ./help.std/$$f -a ! -d ./help.std/$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/help.std/$$f -newer ./help.std/$$f -print` ; \

        fi; \
        fi; \

+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/help.std/$$f ./help.std ;; \
+       esac; \

        done
 
 data_help_png: 
        @mkdir -p ./help.png
        @for f in col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png; do \
        done
 
 data_help_png: 
        @mkdir -p ./help.png
        @for f in col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png; do \

-       if test \( ! -s ./help.png/$$f \) -o \( $(srcdir)/help.png/$$f -nt ./help.png/$$f  \) ; then \
-       cp -pRf $(srcdir)/help.png/$$f ./help.png ; \
+       if test ! -f ./help.png/$$f -a ! -d ./help.png/$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/help.png/$$f -newer ./help.png/$$f -print` ; \

        fi; \
        fi; \

+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/help.png/$$f ./help.png ;; \
+       esac; \

        done
 
 dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp
        done
 
 dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dbbrowse.cpp

 
 dbbrowse_doc.o: $(srcdir)/doc.cpp
 
 dbbrowse_doc.o: $(srcdir)/doc.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/doc.cpp

 
 dbbrowse_pgmctrl.o: $(srcdir)/pgmctrl.cpp
 
 dbbrowse_pgmctrl.o: $(srcdir)/pgmctrl.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/pgmctrl.cpp

 
 dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp
 
 dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/tabpgwin.cpp

 
 dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp
 
 dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/browsedb.cpp

 
 dbbrowse_dbtree.o: $(srcdir)/dbtree.cpp
 
 dbbrowse_dbtree.o: $(srcdir)/dbtree.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dbtree.cpp

 
 dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp
 
 dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dbgrid.cpp

 
 dbbrowse_dlguser.o: $(srcdir)/dlguser.cpp
 
 dbbrowse_dlguser.o: $(srcdir)/dlguser.cpp

-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dlguser.cpp

 
 dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.rc
 
 dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.rc

-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present: