summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/synctexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-09 10:53:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-09 10:53:09 +0000
commit741468a4fbc1314e083ec3961934fedbc6a2d90f (patch)
tree272a135ce5cd21fcd4f42f2baa04a45f47658773 /Build/source/texk/web2c/synctexdir
parentb0cc890be0ceec49e914a5b50cea4428b37044ee (diff)
texk/web2c: Reorganize rules for libsynctex
git-svn-id: svn://tug.org/texlive/trunk@36470 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/synctexdir')
-rw-r--r--Build/source/texk/web2c/synctexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/synctexdir/ac/synctex.ac16
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am24
3 files changed, 18 insertions, 26 deletions
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index f1bda4c4a0e..979e9c8e5d7 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/synctex.a, am/synctex.am: Reorganize rules for libsynctex.
+
2014-12-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* synctex.c: Define SYNCTEX_YES as 1, not -1 (for bitfields).
diff --git a/Build/source/texk/web2c/synctexdir/ac/synctex.ac b/Build/source/texk/web2c/synctexdir/ac/synctex.ac
index 5ecc2fa085b..c6067463730 100644
--- a/Build/source/texk/web2c/synctexdir/ac/synctex.ac
+++ b/Build/source/texk/web2c/synctexdir/ac/synctex.ac
@@ -1,20 +1,20 @@
## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
dnl
-dnl Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
dnl Additional code for synctex
dnl
-dnl Building libsynctex as shared library requires a system zlib
-AM_CONDITIONAL([SYSTEM_ZLIB], [test "x$with_system_zlib" = xyes])
-
-AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno])
-
m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_version.txt]))[.0])
AC_SUBST([SYNCTEXVERSION], [synctex_version])
KPSE_LT_VERSION([synctex])
-AS_IF([test "x$enable_synctex" != xno],
- [AC_SUBST([WANTEDLIBS], [libsynctex.la])])
+
+AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno])
+
+dnl Building libsynctex as shared library requires a system zlib
+AS_IF([test "x$with_system_zlib" = xyes],
+ [AC_SUBST([LTLIBSYNCTEX], [libsynctex.la])],
+ [AC_SUBST([LIBSYNCTEX], [libsynctex.a])])
AC_CONFIG_FILES([synctexdir/synctex.pc])
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index c4481ae1cad..1f3f366de71 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -1,42 +1,30 @@
## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## The SyncTeX tool
if SYNCTEX
bin_PROGRAMS += synctex
+lib_LTLIBRARIES += $(LTLIBSYNCTEX)
+lib_LIBRARIES += $(LIBSYNCTEX)
endif SYNCTEX
EXTRA_PROGRAMS += synctex
+EXTRA_LTLIBRARIES += libsynctex.la
+EXTRA_LIBRARIES += libsynctex.a
synctex_SOURCES = \
synctexdir/synctex_main.c
synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-if SYSTEM_ZLIB
-libsynctex = libsynctex.la
-else !SYSTEM_ZLIB
-libsynctex = libsynctex.a
-endif !SYSTEM_ZLIB
-
synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
$(synctex_OBJECTS): $(libsynctex)
## The (shared or nonshared) SyncTeX parser library
-
-EXTRA_LTLIBRARIES = libsynctex.la
-EXTRA_LIBRARIES += libsynctex.a
-
-if SYNCTEX
-if SYSTEM_ZLIB
-lib_LTLIBRARIES = $(WANTEDLIBS)
-else !SYSTEM_ZLIB
-lib_LIBRARIES = libsynctex.a
-endif !SYSTEM_ZLIB
-endif SYNCTEX
+libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)