Misc. corrections

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

diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in
index 997ed3d6dda3a9fb1cf0fd899cfb7f91b0ec381b..8732066374fe88d02c3d8284f015c6be7e5b390d 100644 (file)
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/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@
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
 SCROLLSUB_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) $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS)
 SCROLLSUB_OBJECTS =  \
        scrollsub_scrollsub.o \
        $(__scrollsub___win32rc)
@@ -104,8 +105,8 @@ 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) -o scrollsub$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scrollsub$(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,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C scrollsub$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_scrollsub_rc.o
+@COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle
 
 ### Targets: ###
 
-all: scrollsub$(EXEEXT)
+all: scrollsub$(EXEEXT) $(__scrollsub_bundle___depname)
 
 clean: 
-       rm -rf ./.deps
+       rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f scrollsub$(EXEEXT)
+       rm -rf scrollsub.app
 
 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
 
@@ -144,12 +146,36 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
        $(CXX) -o $@ $(SCROLLSUB_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)
        $(__scrollsub___mac_rezcmd)
        $(__scrollsub___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
+
+scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+       mkdir -p scrollsub.app/Contents
+       mkdir -p scrollsub.app/Contents/MacOS
+       mkdir -p scrollsub.app/Contents/Resources
+       
+       
+       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+       -e "s/EXECUTABLE/scrollsub/" \
+       -e "s/VERSION/2.5.0/" \
+       $(top_srcdir)/src/mac/Info.plist.in >scrollsub.app/Contents/Info.plist
+       
+       
+       echo -n "APPL????" >scrollsub.app/Contents/PkgInfo
+       
+       
+       ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub
+       
+       
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc
+       ln -f $(top_srcdir)/src/mac/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@scrollsub_bundle: scrollsub.app/Contents
 
 scrollsub_scrollsub.o: $(srcdir)/scrollsub.cpp
        $(CXXC) -c -o $@ $(SCROLLSUB_CXXFLAGS) $<
 
 scrollsub_scrollsub_rc.o: $(srcdir)/scrollsub.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)
+       $(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
 
 uninstall: 
 
@@ -157,4 +183,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install uninstall
+.PHONY: all clean distclean install scrollsub_bundle uninstall