From 40b5d054456f6f87d20988f47daa01864f7c69dc Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 20 Jan 2005 14:44:19 +0000 Subject: [PATCH] avoid bash-isms when making pch.h.gch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9508 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 5 +++++ config/common.am | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index e0cc62cd33..60e51d5670 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2005-01-20 Jean-Marc Lasgouttes + + * common.am (pch-file): new target, used recursively by target + $(PCH_FILE). This avoids bash-isms. + 2005-01-12 Jean-Marc Lasgouttes * lyxinclude.m4: fix default win32 prefix diff --git a/config/common.am b/config/common.am index 3494eb0c10..5803f59f52 100644 --- a/config/common.am +++ b/config/common.am @@ -19,11 +19,12 @@ sinclude ./pch.h.gch.dep *.C *.cpp: $(PCH_FILE) $(PCH_FILE): $(PCH_SOURCE) - TMPCMD=` echo $(CXXCOMPILE) | sed -e s,\",\',` ; \ - PATTERN=`echo $(PCH_FLAGS) | sed -e 's,\/,\\\/,'` ; \ - $${TMPCMD/$$PATTERN} \ - -x c++-header $(PCH_SOURCE) -MT $@ -MD -MP -MF "./$@.Tdep" \ - && mv "./$@.Tdep" "./$@.dep" || rm "./$@.Tdep" + $(MAKE) PCH_FLAGS= pch-file + +pch-file: + $(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -MT $(PCH_FILE) -MD -MP \ + -MF "./$(PCH_FILE).Tdep" \ + && mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" || rm "./$(PCH_FILE).Tdep" endif