commit 9fc27f6bb7a799bc31cae673b9f24221e21f1e7b
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Apr 13 18:27:42 2016 +0200
Make monolithic build code portable to Mac OS
"echo -e" is definitely not portable. Use a plain loop instead.
Also use the automake silent rule mechanism to make the generation of
monolithic source files visible.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9446d17..047188f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -323,7 +323,7 @@ BUILT_SOURCES = lyx_commit_hash.h
CLEANFILES = lyx_commit_hash.h
lyxcore.cpp:
- @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
+ $(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include
"'$${file}'"' ; done >$@
if MONOLITHIC_CORE
@@ -535,7 +535,7 @@ HEADERFILESMATHED = \
mathed/TextPainter.h
lyxmathed.cpp:
- @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
+ $(AM_V_GEN)for file in $(SOURCEFILESMATHED) ; do echo '#include
"'$${file}'"' ; done >$@
if MONOLITHIC_MATHED
@@ -678,7 +678,7 @@ HEADERFILESINSETS = \
# insets/InsetSection.cpp
lyxinsets.cpp:
- @echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
+ $(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include
"'$${file}'"' ; done >$@
if MONOLITHIC_INSETS
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 83c3126..fac0e31 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -35,7 +35,7 @@ HEADERFILES =
lyxclient.cpp:
- @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+ $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"'
; done >$@
if MONOLITHIC_CLIENT
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index e3f41bc..90514fd 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -355,7 +355,7 @@ UIFILES = \
nodist_liblyxqt4_a_SOURCES = Resources.cpp
liblyxqt4.cpp:
- @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+ $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"'
; done >$@
if MONOLITHIC_FRONTEND_QT
diff --git a/status.22x b/status.22x
index e066be6..71acd92 100644
--- a/status.22x
+++ b/status.22x
@@ -107,3 +107,5 @@ What's new
- Due to bug fixes, it is no longer discouraged to build against Qt 5.4.
- Building against Qt < 4.7 no longer fails.
+
+- Fix monolithic builds with autotools on Mac OS X.
