wxPropertyGridInterface docs cleanup and fixes, removed some rarely needed member...

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

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 2c99b6f15987eb4f5a822920172223a70e20fbc1..2639010716203ad4eb04f85a2e9955b22bfdce1f 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -90,10 +90,16 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = conftest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle
 @COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = conftest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle

-@COND_TOOLKIT_COCOA@____conftest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   $(__conftest_app_Contents_PkgInfo___depname)

 @COND_TOOLKIT_MAC@____conftest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__conftest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____conftest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__conftest_app_Contents_PkgInfo___depname)

+@COND_TOOLKIT_OSX_CARBON@____conftest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__conftest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____conftest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__conftest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____conftest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__conftest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____conftest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__conftest_app_Contents_PkgInfo___depname)

 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)


@@ -141,7 +147,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)

-       $(CXX) -o $@ $(CONFTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)

        
        $(__conftest___mac_setfilecmd)
        $(__conftest___os2_emxbindcmd)
        
        $(__conftest___mac_setfilecmd)
        $(__conftest___os2_emxbindcmd)


@@ -186,6 +192,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 conftest_bundle
 
 .PHONY: all install uninstall clean distclean conftest_bundle