remove/replace redundant SetAutoLayout() and Fit() calls, leave just SetSizer[AndFit...

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

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 618ea0319be0abc68936c60a2d671771bbcc3889..c6b98021cb1ce083275d3b830301bc94f212dab5 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -9,45 +9,54 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@

+datarootdir = @datarootdir@

 INSTALL = @INSTALL@
 INSTALL = @INSTALL@

-CPPFLAGS = @CPPFLAGS@
+EXEEXT = @EXEEXT@
+WINDRES = @WINDRES@
+REZ = @REZ@
+SETFILE = @SETFILE@
+NM = @NM@
+BK_DEPS = @BK_DEPS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+LIBS = @LIBS@
+LDFLAGS_GUI = @LDFLAGS_GUI@

 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@

-EXEEXT = @EXEEXT@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@

+CXXWARNINGS = @CXXWARNINGS@

 HOST_SUFFIX = @HOST_SUFFIX@
 HOST_SUFFIX = @HOST_SUFFIX@

-LDFLAGS = @LDFLAGS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-NM = @NM@
-RESCOMP = @RESCOMP@

 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@

-SETFILE = @SETFILE@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-srcdir = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
+wx_top_builddir = @wx_top_builddir@

 
 ### Variables: ###
 
 DESTDIR = 
 
 ### Variables: ###
 
 DESTDIR = 

-DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+WX_RELEASE = 2.9
+WX_VERSION = $(WX_RELEASE).0
+LIBDIRNAME = $(wx_top_builddir)/lib
+DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)

 DISPLAY_OBJECTS =  \
        $(__display___win32rc) \
        $(__display_os2_lib_res) \
        display_display.o
 DISPLAY_OBJECTS =  \
        $(__display___win32rc) \
        $(__display_os2_lib_res) \
        display_display.o

-LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.1

 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)

 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -55,71 +64,103 @@ WX_VERSION = 2.5.1
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(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 -o display$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-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)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_PLATFORM_MAC_0@__display___mac_setfilecmd = @true
+@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C display$(EXEEXT)
+@COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

-@COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C display$(EXEEXT)
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL

 COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep display$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd)
 COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep display$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd)

+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)

 @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o
 @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o

-@COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle

 @COND_PLATFORM_OS2_1@__display_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_OS2_1@__display_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

+@COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle
+@COND_TOOLKIT_COCOA@____display_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   display.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____display_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     display.app/Contents/PkgInfo
+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_BASE_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+       -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
+       $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+       display$(EXEEXT) Carbon.r sample.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)

 
 ### Targets: ###
 
 all: display$(EXEEXT) $(__display_bundle___depname)
 
 
 ### Targets: ###
 
 all: display$(EXEEXT) $(__display_bundle___depname)
 

+install: all
+
+uninstall: 
+
+install-strip: install
+

 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f display$(EXEEXT)
        rm -rf display.app
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f display$(EXEEXT)
        rm -rf display.app
 

+distclean: clean
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+

 display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
 display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)

-       $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(DISPLAY_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)

        $(__display___mac_rezcmd)
        $(__display___mac_setfilecmd)
        $(__display___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__display___mac_rezcmd)
        $(__display___mac_setfilecmd)
        $(__display___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p display.app/Contents
        mkdir -p display.app/Contents/MacOS
        mkdir -p display.app/Contents/Resources
        mkdir -p display.app/Contents
        mkdir -p display.app/Contents/MacOS
        mkdir -p display.app/Contents/Resources


@@ -128,7 +169,7 @@ display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/display/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/display/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >display.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >display.app/Contents/Info.plist

        
        
        echo -n "APPL????" >display.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >display.app/Contents/PkgInfo


@@ -137,28 +178,18 @@ display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f display$(EXEEXT) display.app/Contents/MacOS/display
        
        
        ln -f display$(EXEEXT) display.app/Contents/MacOS/display
        
        

-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc display.app/Contents/Resources/display.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns display.app/Contents/Resources/wxmac.icns
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns

 
 

-@COND_PLATFORM_MACOSX_1@display_bundle: display.app/Contents/PkgInfo
-
-display_display.o: $(srcdir)/display.cpp
-       $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP)

 
 display_sample_rc.o: $(srcdir)/../../samples/sample.rc
 
 display_sample_rc.o: $(srcdir)/../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
-
-distclean: clean
-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-install: all
-
-install-strip: install
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include

 
 

-uninstall: 
+display_display.o: $(srcdir)/display.cpp
+       $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $(srcdir)/display.cpp

 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

-.PHONY: all clean display_bundle distclean install uninstall
+.PHONY: all install uninstall clean distclean display_bundle