From e0d5fc4688cf43e91de521e0c8e8bbf6d17b634f Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 5 Mar 2013 07:17:42 +0000 Subject: texk/web2c: Fix the rules for *tex_version.h git-svn-id: svn://tug.org/texlive/trunk@29295 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 48 +++++++++++++------------- Build/source/texk/web2c/eptexdir/am/eptex.am | 4 +-- Build/source/texk/web2c/etexdir/am/etex.am | 4 +-- Build/source/texk/web2c/pdftexdir/am/pdftex.am | 8 ++--- Build/source/texk/web2c/ptexdir/am/ptex.am | 4 +-- Build/source/texk/web2c/uptexdir/am/uptex.am | 4 +-- Build/source/texk/web2c/xetexdir/am/xetex.am | 8 ++--- 7 files changed, 32 insertions(+), 48 deletions(-) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index f474c229fdc..921237f506a 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -10886,9 +10886,9 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh @$(texmf_tangle) etex etex # Extract etex version -$(srcdir)/etexdir/etex_version.h: etexdir/etex.ch -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch + $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ + | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate etex.web etex.web: tie$(EXEEXT) $(etex_web_srcs) @@ -10923,9 +10923,9 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh @$(texmf_tangle) ptex ptex # Extract ptex version -$(srcdir)/ptexdir/ptex_version.h: ptexdir/ptex-base.ch -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch + $(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ + | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate ptex.web ptex.web: tie$(EXEEXT) $(ptex_web_srcs) @@ -10988,9 +10988,9 @@ eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh @$(texmf_tangle) eptex eptex # Extract eptex version -$(srcdir)/eptexdir/eptex_version.h: eptexdir/eptex.ech -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech + $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ + | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate eptex.web eptex.web: tie$(EXEEXT) $(eptex_web_srcs) @@ -11021,9 +11021,9 @@ uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh @$(texmf_tangle) uptex uptex # Extract uptex version -$(srcdir)/uptexdir/uptex_version.h: uptexdir/uptex-m.ch -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch + $(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ + | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate uptex.web uptex.web: tie$(EXEEXT) $(uptex_web_srcs) @@ -11110,14 +11110,14 @@ pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp) $(makecpool) pdftex >$@ || rm -f $@ # Extract pdftex version -$(srcdir)/pdftexdir/pdftex_version.h: pdftexdir/pdftex.web -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/pdftexdir/pdftex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web + $(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \ + | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Extract etex version -$(srcdir)/pdftexdir/etex_version.h: pdftexdir/pdftex.web -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web + $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ + | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate pdftex.ch pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) @@ -11368,13 +11368,13 @@ xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh @$(xe_tangle) xetex xetex # Extract etex version -$(srcdir)/xetexdir/etex_version.h: xetexdir/xetex.web -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web + $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ + | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -$(srcdir)/xetexdir/xetex_version.h: xetexdir/xetex.web -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ -@MAINTAINER_MODE_TRUE@ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ +$(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web + $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ + | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs) $(tie) -c xetex.ch $(xetex_ch_srcs) diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index bf0757db3fd..c2281acda34 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -46,11 +46,9 @@ eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh @$(texmf_tangle) eptex eptex # Extract eptex version -$(srcdir)/eptexdir/eptex_version.h: eptexdir/eptex.ech -if MAINTAINER_MODE +$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE # Generate eptex.web eptex.web: tie$(EXEEXT) $(eptex_web_srcs) diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 7fb818b1854..dcbe1642d02 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -39,11 +39,9 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh @$(texmf_tangle) etex etex # Extract etex version -$(srcdir)/etexdir/etex_version.h: etexdir/etex.ch -if MAINTAINER_MODE +$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE # Generate etex.web etex.web: tie$(EXEEXT) $(etex_web_srcs) diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index b2359cf5f10..0106c1dc8c1 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -52,18 +52,14 @@ pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp) $(makecpool) pdftex >$@ || rm -f $@ # Extract pdftex version -$(srcdir)/pdftexdir/pdftex_version.h: pdftexdir/pdftex.web -if MAINTAINER_MODE +$(srcdir)/pdftexdir/pdftex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web $(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE # Extract etex version -$(srcdir)/pdftexdir/etex_version.h: pdftexdir/pdftex.web -if MAINTAINER_MODE +$(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE # Generate pdftex.ch pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 265e07dec17..df637935298 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -78,11 +78,9 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh @$(texmf_tangle) ptex ptex # Extract ptex version -$(srcdir)/ptexdir/ptex_version.h: ptexdir/ptex-base.ch -if MAINTAINER_MODE +$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch $(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE # Generate ptex.web ptex.web: tie$(EXEEXT) $(ptex_web_srcs) diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 1304472e115..aca0991bbc8 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -68,11 +68,9 @@ uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh @$(texmf_tangle) uptex uptex # Extract uptex version -$(srcdir)/uptexdir/uptex_version.h: uptexdir/uptex-m.ch -if MAINTAINER_MODE +$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch $(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE # Generate uptex.web uptex.web: tie$(EXEEXT) $(uptex_web_srcs) diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index e3ecdd3ef26..821625540d7 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -81,18 +81,14 @@ xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh @$(xe_tangle) xetex xetex # Extract etex version -$(srcdir)/xetexdir/etex_version.h: xetexdir/xetex.web -if MAINTAINER_MODE +$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE ## Extract xetex version -$(srcdir)/xetexdir/xetex_version.h: xetexdir/xetex.web -if MAINTAINER_MODE +$(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ -endif MAINTAINER_MODE ## Generate xetex.ch xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs) -- cgit v1.2.3