X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e096520b1534689e736a279ec35e20aa2628a290..5078fef715268169f8e1ab0c58dd983acb8767e3:/samples/html/test/Makefile.in?ds=sidebyside diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 2efc88fcc1..27f23a5082 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -35,7 +35,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: ### @@ -158,7 +157,6 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(__test___mac_setfilecmd) $(__test___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) @COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p test.app/Contents @@ -175,7 +173,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >test.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ ln -f test$(EXEEXT) test.app/Contents/MacOS/test +@COND_PLATFORM_MACOSX_1@ mv test$(EXEEXT) test.app/Contents/MacOS/test @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns @@ -201,14 +199,14 @@ test_test_rc.o: $(srcdir)/test.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