Don't needlessly use "echo -e"

The -e parameter to echo isn't recognized by echo in POSIX sh,
but isn't needed when no escaped characters need to be
interpreted.

This fixes building glib with a mingw cross compiler on Mac OS X.

https://bugzilla.gnome.org/show_bug.cgi?id=654085

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 7bd661890ad31bfa9fe6c57bcc53902d07e44cae..77b1a84dca7d9eb1e135cb14c47c92cbbab77cbf 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -24,7 +24,7 @@ uninstall-ms-lib:
        $(uninstall_ms_lib_cmd)
 
 gio.def: gio.symbols
-       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \
+       $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/        /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \
          mv gio.def.tmp gio.def
 
 if OS_LINUX

diff --git a/glib/Makefile.am b/glib/Makefile.am
index f74f78f517c57e96f4ea278b4fa3e1dfd885ea26..22680b8b242daec73e334f92ae63b828fc69bc08 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -56,7 +56,7 @@ AM_CPPFLAGS =                                 \
        -DPCRE_STATIC
 
 glib.def: glib.symbols
-       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/       /') > glib.def
+       $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/  /') > glib.def
 
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index cebfcb46e113e4bd70f624e700cbc4e6417e48a0..4eb5ed75f7211dd3ba5f975d1e1b139cce432ad3 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS =                           \
        -DG_DISABLE_DEPRECATED
 
 gmodule.def: gmodule.symbols
-       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/ /') > gmodule.def
+       $(AM_V_GEN) (echo EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/    /') > gmodule.def
 
 EXTRA_DIST +=                          \
                makefile.msc.in         \

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index af090d66d2c59c44dfd7568664f6ce582d8bf8c3..10b0e2f345600a53a73e03abe2a574a83e60e7d8 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS =                                         \
        -DGOBJECT_COMPILATION
 
 gobject.def: gobject.symbols
-       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gobject.symbols | $(SED) -e '/^$$/d' -e 's/^/      /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def
+       $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gobject.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def
 
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY