added except sample

[wxWidgets.git] / contrib / samples / ogl / ogledit / Makefile.in

diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in
index ef1c6b41384d455ed42ae85dda85c8c76542cc92..008e32a419f8ed6e67e25310cb1e2ba129625652 100644 (file)
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     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!
 # =========================================================================
 
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -74,6 +74,10 @@ COND_PLATFORM_OS2_1___ogledit___os2_emxbindcmd = $(NM) ogledit$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__ogledit_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle
+@COND_TOOLKIT_COCOA@____ogledit_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   ogledit.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____ogledit_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     ogledit.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)
@@ -97,14 +101,14 @@ 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_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 -i \
        $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -133,7 +137,7 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
        $(__ogledit___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p ogledit.app/Contents
        mkdir -p ogledit.app/Contents/MacOS
        mkdir -p ogledit.app/Contents/Resources
@@ -142,7 +146,7 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/ogledit/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >ogledit.app/Contents/Info.plist
        
        
        echo -n "APPL????" >ogledit.app/Contents/PkgInfo
@@ -151,10 +155,10 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc ogledit.app/Contents/Resources/ogledit.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc ogledit.app/Contents/Resources/ogledit.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@ogledit_bundle: $(____ogledit_BUNDLE_TGT_REF_DEP)
 
 ogledit_ogledit.o: $(srcdir)/ogledit.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<