Le 09/03/2016 13:04, Stephan Witt a écrit :
Sorry - it should be:
@for file in $(SOURCEFILES) ; do echo '#include "'$file'"' ; done > $@
With the hash sign included.
I return to these monolithic builds. Does this work on your mac?
JMarc
>From 56a5c7d652df9e337a91273854b700ab68ca796e Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed, 13 Apr 2016 18:27:42 +0200
Subject: [PATCH] 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.
---
src/Makefile.am | 6 +++---
src/client/Makefile.am | 2 +-
src/frontends/qt4/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
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 1c693e4..a78a38b 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -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
--
1.7.9.5
