summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-14 10:49:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-14 10:49:05 +0000
commit595b4e212e6725cb537f0a2004f717ac823594cf (patch)
tree910c9242e6ff6a33276df187d4efa3be8b0d973c /Build/source
parent892ae1fb345dfa7ebd8586a09d09c4cef9d14464 (diff)
Reduce diffs between files in synctexdir/ and luatexdir/utils/
git-svn-id: svn://tug.org/texlive/trunk@21712 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/Makefile.in12
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog9
-rw-r--r--Build/source/texk/web2c/luatexdir/am/libluatex.am7
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am5
-rw-r--r--Build/source/texk/web2c/luatexdir/utils/synctex.c12
5 files changed, 29 insertions, 16 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index e87519ced10..2cb0ba89eef 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1872,8 +1872,9 @@ pdftosrc_DEPENDENCIES = $(pdftex_dependencies)
nodist_EXTRA_luatex_SOURCES = dummy.cxx
luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
$(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \
- -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \
- -I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H`
+ -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \
+ -I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H` \
+ -DSYNCTEX_ENGINE_H='<utils/synctex-luatex.h>'
luatex_CFLAGS = $(WARNING_CFLAGS)
luatex_CXXFLAGS = $(WARNING_CXXFLAGS)
luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a \
@@ -2130,8 +2131,9 @@ libff_a_SOURCES = \
libluatex_a_DEPENDENCIES = libff.a
libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
$(LIBPNG_INCLUDES) $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) \
- -I$(srcdir)/libmd5 -Iluatexdir -I$(srcdir)/luatexdir \
- -I$(srcdir)/luatexdir/lua51 -DpdfTeX
+ -I$(srcdir)/libmd5 -I$(srcdir)/luatexdir \
+ -I$(srcdir)/luatexdir/lua51 -DpdfTeX \
+ -DSYNCTEX_ENGINE_H='<utils/synctex-luatex.h>'
libluatex_a_CFLAGS = $(WARNING_CFLAGS)
libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
luatex_dvi_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/dvi $(ctangle)
@@ -2316,8 +2318,8 @@ libluatex_a_SOURCES = \
luatexdir/utils/managed-sa.h \
luatexdir/utils/synctex-common.h \
luatexdir/utils/synctex-luatex.h \
- luatexdir/utils/synctex.h \
luatexdir/utils/synctex.c \
+ luatexdir/utils/synctex.h \
luatexdir/utils/utils.h
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 596f0b9008b..0657b5062e8 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/libluatex.am (libluatex_a_CPPFLAGS): Remove `-Iluatexdir'
+ and add `-DSYNCTEX_ENGINE_H='<utils/synctex-luatex.h>''.
+ * am/luatex.am (luatex_CPPFLAGS): The same.
+
+ * utils/synctex.c: Fix several typos in comments to reduce diffs
+ between files in synctexdir/ and luatexdir/utils/.
+
2011-02-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/luatex.am [WIN32]: Add texlua.exe and texluac.exe wrappers
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
index 6e26ee981f1..9dd00786574 100644
--- a/Build/source/texk/web2c/luatexdir/am/libluatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -1,6 +1,6 @@
## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## libluatex
@@ -11,8 +11,9 @@ libluatex_a_DEPENDENCIES = libff.a
libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
libluatex_a_CPPFLAGS += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
-libluatex_a_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51
+libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51
libluatex_a_CPPFLAGS += -DpdfTeX
+libluatex_a_CPPFLAGS += -DSYNCTEX_ENGINE_H='<utils/synctex-luatex.h>'
libluatex_a_CFLAGS = $(WARNING_CFLAGS)
libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
@@ -617,8 +618,8 @@ libluatex_a_SOURCES = \
luatexdir/utils/managed-sa.h \
luatexdir/utils/synctex-common.h \
luatexdir/utils/synctex-luatex.h \
- luatexdir/utils/synctex.h \
luatexdir/utils/synctex.c \
+ luatexdir/utils/synctex.h \
luatexdir/utils/utils.h
nodist_libluatex_a_SOURCES += \
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 51f4c58ddef..a210aa807d9 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -1,6 +1,6 @@
## texk/web2c/luatexdir/am/luatex.am: Makefile fragment for luaTeX.
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## luaTeX
@@ -22,8 +22,9 @@ nodist_EXTRA_luatex_SOURCES = dummy.cxx
luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
luatex_CPPFLAGS += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
-luatex_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir
+luatex_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir
luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H`
+luatex_CPPFLAGS += -DSYNCTEX_ENGINE_H='<utils/synctex-luatex.h>'
luatex_CFLAGS = $(WARNING_CFLAGS)
luatex_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/web2c/luatexdir/utils/synctex.c b/Build/source/texk/web2c/luatexdir/utils/synctex.c
index ab76fe9a440..557c0bdae23 100644
--- a/Build/source/texk/web2c/luatexdir/utils/synctex.c
+++ b/Build/source/texk/web2c/luatexdir/utils/synctex.c
@@ -805,8 +805,8 @@ void synctexteehs(void)
static inline void synctex_record_vlist(halfword p);
/* This message is sent when a vlist will be shipped out, more precisely at
- * the beginning of the vliSYNCTEX_out procedure in *TeX.web. It will be balanced
- * by a synctex_tsilv, sent at the end of the vliSYNCTEX_out procedure. p is the
+ * the beginning of the vlist_out procedure in *TeX.web. It will be balanced
+ * by a synctex_tsilv, sent at the end of the vlist_out procedure. p is the
* address of the vlist We assume that p is really a vlist node! */
void synctexvlist(halfword this_box)
{
@@ -830,7 +830,7 @@ static inline void synctex_record_tsilv(halfword p);
/* Recording a "f" line ending a vbox: this message is sent whenever a vlist
* has been shipped out. It is used to close the vlist nesting level. It is
- * sent at the end of the vliSYNCTEX_out procedure in *TeX.web to balance a former
+ * sent at the end of the vlist_out procedure in *TeX.web to balance a former
* synctex_vlist sent at the beginning of that procedure. */
void synctextsilv(halfword this_box)
{
@@ -876,8 +876,8 @@ void synctexvoidvlist(halfword p, halfword this_box __attribute__ ((unused)))
static inline void synctex_record_hlist(halfword p);
/* This message is sent when an hlist will be shipped out, more precisely at
- * the beginning of the hliSYNCTEX_out procedure in *TeX.web. It will be balanced
- * by a synctex_tsilh, sent at the end of the hliSYNCTEX_out procedure. p is the
+ * the beginning of the hlist_out procedure in *TeX.web. It will be balanced
+ * by a synctex_tsilh, sent at the end of the hlist_out procedure. p is the
* address of the hlist We assume that p is really an hlist node! */
void synctexhlist(halfword this_box)
{
@@ -901,7 +901,7 @@ static inline void synctex_record_tsilh(halfword p);
/* Recording a ")" line ending an hbox this message is sent whenever an hlist
* has been shipped out it is used to close the hlist nesting level. It is
- * sent at the end of the hliSYNCTEX_out procedure in *TeX.web to balance a former
+ * sent at the end of the hlist_out procedure in *TeX.web to balance a former
* synctex_hlist sent at the beginning of that procedure. */
void synctextsilh(halfword this_box)
{