Re: [ft-devel] Makefile: echo -> info

[Alexei Podtelezhnikov]

> Can you provide a patch?

There you go. The info eats the leading whitespace though.

diff --git a/builds/detect.mk b/builds/detect.mk
index 771fc31a8..2c81fbdbb 100644
--- a/builds/detect.mk
+++ b/builds/detect.mk
@@ -101,57 +101,28 @@ ifndef CONFIG_FILE
   .PHONY: setup
 endif

-# The following targets are equivalent, with the exception that they use
-# a slightly different syntax for the `echo' command.
+# Flash out and copy rules.
 #
-# std_setup: defined for most (i.e. Unix-like) platforms
-# dos_setup: defined for Dos-ish platforms like Dos, Windows & OS/2
-#
-.PHONY: std_setup dos_setup
+.PHONY: std_setup

 std_setup:
-    @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     $(BUILD_DIR)"
-    @echo "  configuration rules         $(CONFIG_RULES)"
-    @echo ""
-    @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."
-    @echo ""
-    @echo "Otherwise, simply type \`$(MAKE)' again to build the library,"
-    @echo "or \`$(MAKE) refdoc' to build the API reference (this
needs python >= 2.6)."
-    @echo ""
-    @$(COPY) $(CONFIG_RULES) $(CONFIG_MK)
-
-
-# Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly!
-#
-# For `cmd.exe', we use 0xFF as a replacement character for a protected
-# space.
-#
-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 (this needs at
least python 2.6).
-    @type builds$(SEP)newline
-    @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul
+    $(info )
+    $(info $(PROJECT_TITLE) build system -- automatic system detection)
+    $(info )
+    $(info The following settings are used:)
+    $(info )
+    $(info $(space)  platform                    $(PLATFORM))
+    $(info   compiler                    $(CC))
+    $(info   configuration directory     $(subst /,$(SEP),$(BUILD_DIR)))
+    $(info   configuration rules         $(subst /,$(SEP),$(CONFIG_RULES)))
+    $(info )
+    $(info If this does not correspond to your system or settings
please remove the file)
+    $(info `$(CONFIG_MK)' from this directory then read the INSTALL
file for help.)
+    $(info )
+    $(info Otherwise, simply type `$(MAKE)' again to build the library,)
+    $(info or `$(MAKE) refdoc' to build the API reference (this needs
python >= 2.6).)
+    $(info )
+    @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK))


 # EOF
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index 55b0e76ec..0201f7b46 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -133,7 +133,7 @@ ifeq ($(PLATFORM),dos)
       COPY := copy
     endif  # test NT

-    setup: dos_setup
+    setup: std_setup
   endif

 endif     # test PLATFORM dos
diff --git a/builds/modules.mk b/builds/modules.mk
index e1edb17b8..9a7a4a0aa 100644
--- a/builds/modules.mk
+++ b/builds/modules.mk
@@ -41,7 +41,7 @@ endif

 define FTMODULE_H_INIT
 $(REMOVE_MODULE)
address@hidden Generating modules list in $(FTMODULE_H)...
+$(info Generating modules list in $(FTMODULE_H)...)
 $(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE)
 endef

@@ -56,7 +56,7 @@ endef

 define FTMODULE_H_DONE
 $(OPEN_MODULE)/* EOF */$(CLOSE_MODULE)
address@hidden done.
+$(info done.)
 endef


diff --git a/builds/os2/detect.mk b/builds/os2/detect.mk
index 2edb8d4c1..aaf78488b 100644
--- a/builds/os2/detect.mk
+++ b/builds/os2/detect.mk
@@ -65,7 +65,7 @@ ifeq ($(PLATFORM),os2)
     .PHONY: devel
   endif

-  setup: dos_setup
+  setup: std_setup

 endif   # test PLATFORM os2

diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 89424514f..c08c3b756 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -84,7 +84,7 @@ uninstall:


 check:
-    @echo There is no validation suite for this package.
+    $(info There is no validation suite for this package.)


 .PHONY: clean_project_unix distclean_project_unix
diff --git a/builds/windows/detect.mk b/builds/windows/detect.mk
index b047e0215..503c25fd0 100644
--- a/builds/windows/detect.mk
+++ b/builds/windows/detect.mk
@@ -95,22 +95,22 @@ ifeq ($(PLATFORM),windows)

   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 ÿ
+        $(info )
+        $(info $(PROJECT_TITLE) build system -- supported compilers)
+        $(info )
+        $(info Several command-line compilers are supported on Win32:)
+        $(info )
+        $(info   make setup                     gcc (with Mingw))
+        $(info   make setup visualc             Microsoft Visual C++)
+        $(info   make setup bcc32               Borland C/C++)
+        $(info   make setup lcc                 Win32-LCC)
+        $(info   make setup intelc              Intel C/C++)
+        $(info )

     setup: dump_target_list
     .PHONY: dump_target_list list
   else
-    setup: dos_setup
+    setup: std_setup
   endif

   # additionally, we provide hooks for various other compilers
diff --git a/configure b/configure
index 8ee0d4029..f9d218667 100755
--- a/configure
+++ b/configure
@@ -29,7 +29,7 @@ else
 fi

 if test "x`$MAKE -v 2>/dev/null | egrep 'GNU|makepp'`" = x; then
-  echo "GNU make (>= 3.80) or makepp (>= 1.19) is required to build
FreeType2." >&2
+  echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build
FreeType2." >&2
   echo "Please try" >&2
   echo >&2
   echo "  MAKE=<GNU make command name> $0" >&2