moved GTK headers needed by wxUniv to GTK_LOWLEVEL_HDR from GTK_HDR (should fix 1016249)

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

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index c000805fd29f6cc8e131885525c401ce7f9598ed..bd2b0dadf8f57e9b14abfc841589a829812bb2e9 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -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
 STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
@@ -74,6 +74,10 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle
+@COND_TOOLKIT_COCOA@____stctest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   stctest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____stctest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     stctest.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)
@@ -103,7 +107,7 @@ 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 stctest$(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: ###
@@ -132,7 +136,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
        $(__stctest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p stctest.app/Contents
        mkdir -p stctest.app/Contents/MacOS
        mkdir -p stctest.app/Contents/Resources
@@ -150,10 +154,10 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
        ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc stctest.app/Contents/Resources/stctest.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc stctest.app/Contents/Resources/stctest.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@stctest_bundle: stctest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP)
 
 data: 
        @mkdir -p .