X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e3165d72520d7d642640ed57c58c620884848fc..c4e2838090992384911a6a6aa44cac985d79a555:/samples/shaped/Makefile.in?ds=sidebyside diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 1587483da0..bd1147af3f 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) +# Bakefile 0.1.6 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ DESTDIR = WX_RELEASE = 2.5 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(top_builddir)lib SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) @@ -111,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ 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 -i $(top_srcdir)/include -o shaped$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -131,7 +131,7 @@ clean: rm -rf shaped.app distclean: clean - rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(CXX) -o $@ $(SHAPED_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_FOR_BASE) $(EXTRALIBS_FOR_GUI) @@ -140,7 +140,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(__shaped___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p shaped.app/Contents mkdir -p shaped.app/Contents/MacOS mkdir -p shaped.app/Contents/Resources @@ -158,7 +158,7 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc shaped.app/Contents/Resources/shaped.rsrc + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc shaped.app/Contents/Resources/shaped.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@shaped_bundle: $(____shaped_BUNDLE_TGT_REF_DEP) @@ -166,16 +166,20 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p data: @mkdir -p . @for f in star.png; do \ - if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f \) ; then \ - cp -pRf $(srcdir)/$$f . ; \ + if test ! -e ./$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/$$f . ;; \ + esac; \ done shaped_shaped.o: $(srcdir)/shaped.cpp - $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $< + $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $(srcdir)/shaped.cpp shaped_shaped_rc.o: $(srcdir)/shaped.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include # Include dependency info, if present: