texk/web2c [MinGW]: SyncTeX requires libshlwapi.a

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

4 files changed, 78 insertions, 63 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index fe1b28004f0..60569dd7bed 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -122,7 +122,7 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
 	$(am__append_50) $(am__append_52) $(am__append_58) \
 	$(am__append_62) $(am__append_64) $(am__append_70) \
 	$(am__append_81) $(am__append_82) $(am__append_90) \
-	$(am__append_92) $(am__append_95) $(am__append_127) \
+	$(am__append_92) $(am__append_95) $(am__append_129) \
 	libmd5/md5.test
 @WEB_TRUE@am__append_1 = $(web_programs)
 @WEB_TRUE@am__append_2 = $(web_tests)
@@ -235,91 +235,93 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
 @SYNCTEX_TRUE@am__append_96 = synctex
 @SYNCTEX_TRUE@am__append_97 = $(LTLIBSYNCTEX)
 @SYNCTEX_TRUE@am__append_98 = $(LIBSYNCTEX)
-@TEX_SYNCTEX_TRUE@am__append_99 = -I$(srcdir)/synctexdir \
+@MINGW32_TRUE@am__append_99 = -lshlwapi
+@MINGW32_TRUE@am__append_100 = -lshlwapi
+@TEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_101 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_102 = \
+@TEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_104 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_103 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_105 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_106 = \
+@ETEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_108 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PTEX_SYNCTEX_TRUE@am__append_107 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_109 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_110 = \
+@PTEX_SYNCTEX_TRUE@am__append_110 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_111 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_112 = \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
 
-@UPTEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_112 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_113 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_114 = \
+@UPTEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_116 = \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
 
-@EPTEX_SYNCTEX_TRUE@am__append_115 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_117 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_117 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_118 = \
+@EPTEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_120 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
-@EUPTEX_SYNCTEX_TRUE@am__append_119 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_121 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_122 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_124 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_125 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_124 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_126 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_125 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_127 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_126 = \
+@XETEX_SYNCTEX_TRUE@am__append_128 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@SYNCTEX_TRUE@am__append_127 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_129 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -938,7 +940,8 @@ am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT) \
 libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libsynctex_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libsynctex_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libsynctex_la_OBJECTS = synctexdir/libsynctex_la-synctex_parser.lo \
 	synctexdir/libsynctex_la-synctex_parser_utils.lo
 libsynctex_la_OBJECTS = $(am_libsynctex_la_OBJECTS)
@@ -1259,7 +1262,8 @@ ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
 am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
 synctex_OBJECTS = $(am_synctex_OBJECTS)
 am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-synctex_DEPENDENCIES = $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1)
+synctex_DEPENDENCIES = $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 nodist_tangle_OBJECTS = tangle.$(OBJEXT)
 tangle_OBJECTS = $(nodist_tangle_OBJECTS)
 tangle_LDADD = $(LDADD)
@@ -2542,18 +2546,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_99)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_101)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_100)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_102)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_102)
+dist_tex_SOURCES = texextra.c $(am__append_104)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_101)
+tex_prereq = texd.h $(am__append_103)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -2683,19 +2687,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_103)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_105)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_104)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_106)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	etexdir/etex_version.h $(am__append_106)
+	etexdir/etex_version.h $(am__append_108)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_105)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_107)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -2730,20 +2734,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_107)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_109)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_108)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_110)
 ptex_DEPENDENCIES = $(ptex_dependencies)
 
 # pTeX C sources
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
 dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_110)
+	ptexdir/ptex_version.h $(am__append_112)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_109)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_111)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2777,22 +2781,22 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
 # e-pTeX Tests
 #
 eptex_tests = eptexdir/eptriptest
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_115)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_117)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) $(am__append_116)
+	$(ipc_socketlibs) $(am__append_118)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_118)
+	eptexdir/eptex_version.h $(am__append_120)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_117)
+	eptexdir/eptex_version.h $(am__append_119)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2824,21 +2828,21 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
 	uptexdir/yokotate.test
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_111)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_113)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_112)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_114)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
 dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_114)
+	uptexdir/uptex_version.h $(am__append_116)
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
 uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_113)
+	uptexdir/uptex_version.h $(am__append_115)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2873,23 +2877,23 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies)
 # e-upTeX Tests
 #
 euptex_tests = euptexdir/euptriptest
-euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_119)
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_121)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) $(am__append_120)
+	$(ipc_socketlibs) $(am__append_122)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
 
 # e-upTeX C sources
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_122)
+	$(am__append_124)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_121)
+	uptexdir/uptex_version.h $(am__append_123)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2941,7 +2945,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_123)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_125)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -2954,7 +2958,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_124)
+	$(am__append_126)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -3399,7 +3403,7 @@ xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
 	$(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_125)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_127)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3410,7 +3414,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_126)
+	$(am__append_128)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -3541,12 +3545,12 @@ synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_99)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_100)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index 5753c7e692f..511d89c8ede 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/synctex.am [MinGW]: SyncTeX requires libshlwapi.a.
+	* synctex_parser_utils.c: Avoid an unused variable.
+
 2015-03-23  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* synctex_parser_utils.c: Fix a bug in
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 1f3f366de71..af9a5bd6a18 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -20,6 +20,9 @@ synctex_SOURCES = \
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
 
 synctex_LDADD =  $(libsynctex) $(ZLIB_LIBS)
+if MINGW32
+synctex_LDADD += -lshlwapi
+endif MINGW32
 
 $(synctex_OBJECTS): $(libsynctex)
 
@@ -32,6 +35,9 @@ libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
 
 libsynctex_la_LIBADD = $(ZLIB_LIBS)
+if MINGW32
+libsynctex_la_LIBADD += -lshlwapi
+endif MINGW32
 
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
diff --git a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c
index e2edbc2863c..2fef636d59b 100644
--- a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c
+++ b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c
@@ -116,7 +116,6 @@ void _synctex_strip_last_path_extension(char * string) {
 	if(NULL != string){
 		char * last_component = NULL;
 		char * last_extension = NULL;
-		char * next = NULL;
 #       if defined(SYNCTEX_WINDOWS)
 		last_component = PathFindFileName(string);
 		last_extension = PathFindExtension(string);
@@ -126,6 +125,7 @@ void _synctex_strip_last_path_extension(char * string) {
 			last_extension[0] = '\0';
 		}
 #       else
+		char * next = NULL;
 		/*  first we find the last path component */
 		if(NULL == (last_component = strstr(string,"/"))){
 			last_component = string;