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 9446d17be269d5a3025d5737021f9c0a7ff744c5..047188f848df3a5c45393dcf38d58be622820a8c 100644 (file)
--- 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 83c31265b5e6684bb51dca80d8078e3b9daabc6f..fac0e31bc19eb705476b7b3f63773e8b82ca1de9 100644 (file)
--- 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 e3f41bc12cd510bfbce0806abe439706ea82f72c..90514fd2a3308a6d2ce8942e04e108bf51322f73 100644 (file)
--- 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 e066be697dd8071912dcccbae85055f4f2ab4986..71acd92344c74cb7b303a21f6a68d3a459a55dd4 100644 (file)
--- 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.