summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-03 22:18:29 +0000
committerKarl Berry <karl@freefriends.org>2009-06-03 22:18:29 +0000
commite100f2a4b1daafea0e05c0b4d44df0b054219ab9 (patch)
tree7ea5f9cd33eac1d0444f7ffd2049c45093aed0c6 /Build
parent4e8237b3634d682a437a4187788f6f2a7ee519c9 (diff)
do not link pdftosrc with libpdftex.a
git-svn-id: svn://tug.org/texlive/trunk@13617 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/Makefile.in11
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am5
3 files changed, 16 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index ed37f3bf66f..b8b81f21303 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -605,9 +605,8 @@ am__objects_14 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) \
nodist_pdftex_OBJECTS = $(am__objects_14) pdftex-pdftex-pool.$(OBJEXT) \
pdftex-pdftexextra.$(OBJEXT) $(am__objects_15)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_6 = libpdftex.a $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) libmd5.a
+am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a
am_pdftosrc_OBJECTS = pdftosrc-pdftosrc.$(OBJEXT)
pdftosrc_OBJECTS = $(am_pdftosrc_OBJECTS)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
@@ -1396,14 +1395,16 @@ etex_tests = etexdir/etrip.test
pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \
$(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \
-I$(srcdir)/pdftexdir
-pdftex_ldadd = libpdftex.a $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) \
+
+# used for both pdftex and pdftosrc.
+pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) \
$(OBSDCOMPAT_LIBS) libmd5.a
pdftex_dependencies = $(proglib) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) \
$(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_44)
-pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
+pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index d341349299b..dc9cc0a6432 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-04 Karl Berry <karl@tug.org>
+
+ * am/pdftex.am (pdftex_LDADD): add libpdftex.a here.
+ (pdftex_ldadd): remove it from here, so we do not try
+ to link pdftosrc with it.
+ Report from vvv, tlbuild mail 03 Jun 2009 21:45:00.
+
2009-05-07 Norbert Preinig <preining@logic.at>
* pdftosrc.cc: add warning that poppler version doesn't support
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 079ffcf1a7e..3f2ddbeb8ca 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -7,7 +7,8 @@ pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
pdftex_cppflags += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
pdftex_cppflags += -I$(srcdir)/pdftexdir
-pdftex_ldadd = libpdftex.a $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS)
+# used for both pdftex and pdftosrc.
+pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS)
pdftex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a
pdftex_dependencies = $(proglib)
@@ -29,7 +30,7 @@ pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
pdftex_CPPFLAGS = $(pdftex_cppflags)
## With --enable-ipc, pdfTeX may need to link with -lsocket.
-pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
+pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a