From 8666131acf2c50a7a30a2e322830d9498ae1d902 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Jun 2022 22:38:58 +0100 Subject: [PATCH] Remove inexistent USE_HELP.html from samples/help makefile This file was removed back in 961a1c2b39 (Remove unused Java class files without sources from help sample, 2017-10-04) but was left in the bake- and make-files. Somehow this didn't create any problems with GNU make, where cp exited with an error, but make recipe succeeded nevertheless, but it results in a build error with BSD make. --- samples/help/Makefile.in | 2 +- samples/help/help.bkl | 1 - samples/help/makefile.gcc | 2 +- samples/help/makefile.vc | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 49e5ec761f..c09364f194 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -200,7 +200,7 @@ data: data_doc: @mkdir -p ./doc - @for f in aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \ + @for f in aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \ if test ! -f ./doc/$$f -a ! -d ./doc/$$f ; \ then x=yep ; \ else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \ diff --git a/samples/help/help.bkl b/samples/help/help.bkl index 06bcbdfec8..e73af3f55d 100644 --- a/samples/help/help.bkl +++ b/samples/help/help.bkl @@ -42,7 +42,6 @@ icon2.gif index.html logo.gif - USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index 267d70edd3..9314f9e656 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -230,7 +230,7 @@ data: data_doc: if not exist $(OBJS)\doc mkdir $(OBJS)\doc - for %%f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc + for %%f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc $(OBJS)\help_sample_rc.o: ./../../samples/sample.rc $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 23ae804ba5..a6d14e92d8 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -439,7 +439,7 @@ data: data_doc: if not exist $(OBJS)\doc mkdir $(OBJS)\doc - for %f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc + for %f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc $(OBJS)\help_sample.res: .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc