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.
This commit is contained in:
Jean-Marc Lasgouttes 2016-04-13 18:27:42 +02:00
parent 9f04fc1c90
commit 0576973b8d
4 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -355,7 +355,7 @@ UIFILES = \
liblyxqt4.cpp:
@echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
$(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
if MONOLITHIC_FRONTEND_QT

View File

@ -76,3 +76,4 @@ What's new
* BUILD/INSTALLATION
- Fix monolithic builds with autotools on Mac OS X.