From 7c517bf3501ae68c4a87c8a126955281ad2393b2 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 6 Jul 2011 16:41:44 +0300 Subject: [PATCH] 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 --- gio/Makefile.am | 2 +- glib/Makefile.am | 2 +- gmodule/Makefile.am | 2 +- gobject/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gio/Makefile.am b/gio/Makefile.am index 7bd6618..77b1a84 100644 --- 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 f74f78f..22680b8 100644 --- 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 cebfcb4..4eb5ed7 100644 --- 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 af090d6..10b0e2f 100644 --- 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 -- 2.7.4