continue setting scrollbars even if only width/height changes, not both of them ...

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

diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in
index 6b9cf76e334db71199ec0e068bce0d481780eb29..fc988c922f06ac347edbedb23c2c1258538a6624 100644 (file)
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SETFILE = @SETFILE@
 TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 TOOLKIT = @TOOLKIT@
@@ -35,7 +36,8 @@ top_srcdir = @top_srcdir@
 ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
+       -I$(srcdir)/../../include $(CXXFLAGS)
 ANITEST_OBJECTS =  \
        anitest_anitest.o \
        $(__anitest___win32rc)
@@ -104,8 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \
+       anitest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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)
@@ -122,26 +125,52 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C anitest$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__anitest___win32rc = anitest_anitest_rc.o
+@COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle
 
 ### Targets: ###
 
-all: anitest$(EXEEXT) data
+all: anitest$(EXEEXT) $(__anitest_bundle___depname) data
 
 anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
        $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX) $(__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)
        $(__anitest___mac_rezcmd)
        $(__anitest___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
+
+anitest.app/Contents: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+       mkdir -p anitest.app/Contents
+       mkdir -p anitest.app/Contents/MacOS
+       mkdir -p anitest.app/Contents/Resources
+       
+       
+       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+       -e "s/EXECUTABLE/anitest/" \
+       -e "s/VERSION/2.5.0/" \
+       $(top_srcdir)/src/mac/Info.plist.in >anitest.app/Contents/Info.plist
+       
+       
+       echo -n "APPL????" >anitest.app/Contents/PkgInfo
+       
+       
+       ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest
+       
+       
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc anitest.app/Contents/Resources/anitest.rsrc
+       ln -f $(top_srcdir)/src/mac/wxmac.icns anitest.app/Contents/Resources/wxmac.icns
 
 anitest_anitest.o: $(srcdir)/anitest.cpp
        $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
 anitest_anitest_rc.o: $(srcdir)/anitest.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include
+
+@COND_PLATFORM_MACOSX_1@anitest_bundle: anitest.app/Contents
 
 clean: 
-       rm -rf ./.deps
+       rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f anitest$(EXEEXT)
+       rm -rf anitest.app
 
 data: 
        @mkdir -p .
@@ -152,8 +181,7 @@ data:
        done
 
 distclean: clean
-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
+       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all
 
@@ -165,4 +193,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean data distclean install uninstall
+.PHONY: all anitest_bundle clean data distclean install uninstall