RCS-IDs

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

diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 36215bb6f3025da33a89d5f8b12612f900628d2d..4a42ff27b1c77457a7347b28169e569adc381a6d 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -93,10 +93,16 @@ COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = combo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__combo_bundle___depname = combo_bundle
 @COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = combo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__combo_bundle___depname = combo_bundle

-@COND_TOOLKIT_COCOA@____combo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   $(__combo_app_Contents_PkgInfo___depname)

 @COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__combo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__combo_app_Contents_PkgInfo___depname)

+@COND_TOOLKIT_OSX_CARBON@____combo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__combo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____combo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__combo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____combo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__combo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____combo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__combo_app_Contents_PkgInfo___depname)

 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)


@@ -146,7 +152,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)

-       $(CXX) -o $@ $(COMBO_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)

        
        $(__combo___mac_setfilecmd)
        $(__combo___os2_emxbindcmd)
        
        $(__combo___mac_setfilecmd)
        $(__combo___os2_emxbindcmd)


@@ -203,6 +209,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:

-@IF_GNU_MAKE@-include ./.deps/*.d
+@IF_GNU_MAKE@-include .deps/*.d

 
 .PHONY: all install uninstall clean distclean combo_bundle data
 
 .PHONY: all install uninstall clean distclean combo_bundle data