reSWIGged

[wxWidgets.git] / contrib / samples / fl / Makefile.in

diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index dd170338b378d9d4cf7805cfb51f9e3216b24a21..d5285dc56c309e90a6c755e9474f3341b609b116 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -36,8 +35,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).5
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -160,35 +159,35 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
        $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
        $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
        $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
        $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
        $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_2 = -d __WXUNIVERSAL__
@@ -268,7 +267,7 @@ fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
        $(__fl_demo1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_demo1.app/Contents
        mkdir -p fl_demo1.app/Contents/MacOS
        mkdir -p fl_demo1.app/Contents/Resources
@@ -286,7 +285,6 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)
@@ -298,7 +296,7 @@ fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
        $(__fl_demo2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_demo2.app/Contents
        mkdir -p fl_demo2.app/Contents/MacOS
        mkdir -p fl_demo2.app/Contents/Resources
@@ -316,7 +314,6 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)
@@ -328,7 +325,7 @@ fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
        $(__fl_sample1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_sample1.app/Contents
        mkdir -p fl_sample1.app/Contents/MacOS
        mkdir -p fl_sample1.app/Contents/Resources
@@ -346,7 +343,6 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbo
        ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)
@@ -358,7 +354,7 @@ fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
        $(__fl_sample2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_sample2.app/Contents
        mkdir -p fl_sample2.app/Contents/MacOS
        mkdir -p fl_sample2.app/Contents/Resources
@@ -376,7 +372,6 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbo
        ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)
@@ -388,7 +383,7 @@ fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
        $(__fl_sample3___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_sample3.app/Contents
        mkdir -p fl_sample3.app/Contents/MacOS
        mkdir -p fl_sample3.app/Contents/Resources
@@ -406,7 +401,6 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbo
        ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fl_sample3_bundle: $(____fl_sample3_BUNDLE_TGT_REF_DEP)