--- detect.mk Sat Mar 14 08:45:26 2009 +++ detect_new.mk Wed Sep 19 14:39:56 2012 @@ -64,7 +64,7 @@ # # really defines $(SEP) as `\' on Unix, and `\\' on Dos and Windows! # -BACKSLASH := $(strip \ ) +BACKSLASH := $(strip \\\ ) # Find all auto-detectable platforms. # @@ -129,26 +129,27 @@ @$(COPY) $(CONFIG_RULES) $(CONFIG_MK) -# Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly! +# Special case for Windows 7 / Vista where echo "" works correctly, but forward-slash ('/') needs to replaced with backslash ('\') +# and text should be surrounded by double-quotes to avoid errors when the text contains parenthesis. # dos_setup: - @type builds$(SEP)newline - @echo $(PROJECT_TITLE) build system -- automatic system detection - @type builds$(SEP)newline - @echo The following settings are used: - @type builds$(SEP)newline - @echo platformÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(PLATFORM) - @echo compilerÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(CC) - @echo configuration directoryÿÿÿÿÿÿ$(subst /,$(SEP),$(BUILD_DIR)) - @echo configuration rulesÿÿÿÿÿÿÿÿÿÿ$(subst /,$(SEP),$(CONFIG_RULES)) - @type builds$(SEP)newline - @echo If this does not correspond to your system or settings please remove the file - @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. - @type builds$(SEP)newline - @echo Otherwise, simply type 'make' again to build the library. - @echo or 'make refdoc' to build the API reference (the latter needs python). - @type builds$(SEP)newline - @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul + @echo "" + @echo "$(PROJECT_TITLE) build system -- automatic system detection" + @echo "" + @echo "The following settings are used:" + @echo "" + @echo " platform $(PLATFORM)" + @echo " compiler $(CC)" + @echo " configuration directory $(subst /,$(SEP),$(BUILD_DIR))" + @echo " configuration rules $(subst /,$(SEP),$(CONFIG_RULES))" + @echo "" + @echo "If this doesn't correspond to your system or settings please remove the" + @echo "file '$(CONFIG_MK)' from this directory then read the INSTALL file for help." + @echo "" + @echo "Otherwise, simply type '$(MAKE)' again to build the library, or type" + @echo "'$(MAKE) refdoc' to build the API reference (the latter needs python)." + @echo "" + @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES)) $(CONFIG_MK) # EOF --- modules.mk Sat Mar 14 08:45:26 2009 +++ modules.mk Wed Sep 19 14:13:47 2012 @@ -29,8 +29,8 @@ $(FTMODULE_H_DONE) ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),) - OPEN_MODULE := @echo$(space) - CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H)) + OPEN_MODULE := @echo " + CLOSE_MODULE := " >> $(subst /,$(SEP),$(FTMODULE_H)) REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H)) else OPEN_MODULE := @echo " --- win32\detect.mk Sat Mar 14 08:45:26 2009 +++ win32\detect.mk Wed Sep 19 14:00:18 2012 @@ -94,17 +94,17 @@ ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target dump_target_list: - @echo ÿ - @echo $(PROJECT_TITLE) build system -- supported compilers - @echo ÿ - @echo Several command-line compilers are supported on Win32: - @echo ÿ - @echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw) - @echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++ - @echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++ - @echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC - @echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++ - @echo ÿ + @echo "" + @echo "$(PROJECT_TITLE) build system -- supported compilers" + @echo "" + @echo "Several command-line compilers are supported on Win32:" + @echo "" + @echo " make setup gcc (with Mingw)" + @echo " make setup visualc Microsoft Visual C++" + @echo " make setup bcc32 Borland C/C++" + @echo " make setup lcc Win32-LCC" + @echo " make setup intelc Intel C/C++" + @echo "" setup: dump_target_list .PHONY: dump_target_list list