X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..d2bb72ffd5457d12ca7c77282fa0dd94f8ca5fd9:/demos/fractal/Makefile.in diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 5c58232062..24eac54076 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ CXXWARNINGS = @CXXWARNINGS@ HOST_SUFFIX = @HOST_SUFFIX@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ wx_top_builddir = @wx_top_builddir@ ### Variables: ### @@ -151,7 +150,6 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) $(__fractal___mac_setfilecmd) $(__fractal___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) @COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p fractal.app/Contents @@ -168,7 +166,7 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >fractal.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal +@COND_PLATFORM_MACOSX_1@ mv fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns @@ -182,14 +180,14 @@ fractal_fractal_rc.o: $(srcdir)/fractal.rc $(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 -$(srcdir)/include/wx/stc/stc.h: \ -$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ -$(srcdir)/src/stc/stc.cpp.in \ -$(srcdir)/src/stc/stc.h.in \ -$(srcdir)/src/stc/gen_iface.py - cd $(srcdir)/src/stc && ./gen_iface.py -monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ -$(srcdir)/include/wx/stc/stc.h +@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \ +@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \ +@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \ +@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py +@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py +@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d