use CPPFLAGS instead of sed-substituted source files

git-svn-id: svn://tug.org/texlive/trunk@21711 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 18 insertions, 30 deletions

diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index e5a13b8e8ad..6ffc25cf5b2 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* synctex.c: Instead of sed-substituting TEX-OR-MF-OR-MP in
+	#include "synctex-TEX-OR-MF-OR-MP.h", #include SYNCTEX_ENGINE_H
+	and add -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" to CPPFLAGS for TeX
+	and similarly for e-TeX, pdfTeX, and XeTeX.
+	* am/synctex.am: Adapt.
+
 2011-03-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid compiler warnings (redo changes from 2010-01-22).
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 136ee1c4fd6..e548006f921 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -57,20 +57,15 @@ tex_ch_synctex = \
 	synctexdir/synctex-rec.ch2
 
 dist_tex_SOURCES += \
+	synctexdir/synctex.c \
 	synctexdir/synctex.h \
 	synctexdir/synctex-common.h \
 	synctexdir/synctex-tex.h
 
-nodist_tex_SOURCES += \
-	synctex.c
-
-tex_CPPFLAGS += -D__SyncTeX__
+tex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
 
 endif TEX_SYNCTEX
 
-synctex.c: texd.h synctexdir/synctex.c $(dist_tex_SOURCES)
-	sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/synctexdir/synctex.c >$@
-
 EXTRA_DIST += \
 	synctexdir/synctex-mem.ch0 \
 	synctexdir/synctex-mem.ch1 \
@@ -99,20 +94,15 @@ etex_ch_synctex = \
 	synctexdir/synctex-e-rec.ch1
 
 dist_etex_SOURCES += \
+	synctexdir/synctex.c \
 	synctexdir/synctex.h \
 	synctexdir/synctex-common.h \
 	synctexdir/synctex-etex.h
 
-nodist_etex_SOURCES += \
-	synctex-e.c
-
-etex_CPPFLAGS += -D__SyncTeX__
+etex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
 
 endif ETEX_SYNCTEX
 
-synctex-e.c: etexd.h synctexdir/synctex.c $(dist_etex_SOURCES)
-	sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/synctexdir/synctex.c >$@
-
 EXTRA_DIST += \
 	synctexdir/synctex-e-mem.ch0 \
 	synctexdir/synctex-e-mem.ch1 \
@@ -137,20 +127,15 @@ pdftex_ch_synctex = \
 	synctexdir/synctex-pdf-rec.ch2
 
 dist_pdftex_SOURCES += \
+	synctexdir/synctex.c \
 	synctexdir/synctex.h \
 	synctexdir/synctex-common.h \
 	synctexdir/synctex-pdftex.h
 
-nodist_pdftex_SOURCES += \
-	synctex-pdf.c
-
-pdftex_CPPFLAGS += -D__SyncTeX__
+pdftex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
 
 endif PDFTEX_SYNCTEX
 
-synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES)
-	sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/synctexdir/synctex.c >$@
-
 EXTRA_DIST += \
 	synctexdir/synctex-pdf-rec.ch2
 
@@ -173,20 +158,15 @@ xetex_post_ch_synctex = \
 	synctexdir/synctex-xe-rec.ch3
 
 dist_xetex_SOURCES += \
+	synctexdir/synctex.c \
 	synctexdir/synctex.h \
 	synctexdir/synctex-common.h \
 	synctexdir/synctex-xetex.h
 
-nodist_xetex_SOURCES += \
-	synctex-xe.c
-
-xetex_CPPFLAGS += -D__SyncTeX__
+xetex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
 
 endif XETEX_SYNCTEX
 
-synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES)
-	sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/synctexdir/synctex.c >$@
-
 EXTRA_DIST += \
 	synctexdir/synctex-xe-mem.ch2 \
 	synctexdir/synctex-xe-rec.ch2 \
diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c
index ec8d847b5f2..4e2fa607051 100644
--- a/Build/source/texk/web2c/synctexdir/synctex.c
+++ b/Build/source/texk/web2c/synctexdir/synctex.c
@@ -277,9 +277,9 @@ Latest Revision: Wed Jul  1 08:15:44 UTC 2009
 #   define __attribute__(A)
 #   endif
 
-/*  In the header file below, TEX-OR-MF-OR-MP is replaced by the real name (tex, etex...)
+/*  The header file SYNCTEX_ENGINE_H below is "synctex-tex.h" for TeX, ...
  *  Some macros will be redefined and additional headers will be imported */
-#   include "synctex-TEX-OR-MF-OR-MP.h"
+#   include SYNCTEX_ENGINE_H
 
 #   include "synctex.h"