making the width of the popup button dependent from the window variant, adding a...

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

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 64d74f7cd3494a45fa617b77d9bffa4023d99e88..e87ae3975827d7435a676e4188c497d6ad86f1df 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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


@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2

 LIBDIRNAME = $(top_builddir)lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 LIBDIRNAME = $(top_builddir)lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)


@@ -70,6 +70,10 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle
 @COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle

+@COND_TOOLKIT_COCOA@____conftest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   conftest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____conftest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     conftest.app/Contents/PkgInfo

 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)


@@ -93,13 +97,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \

-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)

 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(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 \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o conftest$(EXEEXT) \
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(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 \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o conftest$(EXEEXT) \

-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.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: ###


@@ -128,7 +132,7 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
        $(__conftest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__conftest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


@@ -137,7 +141,7 @@ conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/conftest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/conftest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >conftest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >conftest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >conftest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >conftest.app/Contents/PkgInfo


@@ -146,10 +150,10 @@ conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
        
        
        ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
        
        

-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc conftest.app/Contents/Resources/conftest.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc conftest.app/Contents/Resources/conftest.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns

 
 

-@COND_PLATFORM_MACOSX_1@conftest_bundle: conftest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)

 
 conftest_conftest.o: $(srcdir)/conftest.cpp
        $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $<
 
 conftest_conftest.o: $(srcdir)/conftest.cpp
        $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $<