Scripts for connecting LyX with evince for backward/forward search

[lyx.git] / 3rdparty / libiconv / Makefile.am

diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am
index 2a516a57e975e7a0bb1ce3c51f0d1ea0bd7c6bce..d03032d13192d4a952840eec119fefc936a45ade 100644 (file)
--- a/3rdparty/libiconv/Makefile.am
+++ b/3rdparty/libiconv/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/config/common.am
 
-# This is prepared for compilation, but currently only used for packaging,
-# because configure support for compilation is still missing.
-
+# We do not build right now
 noinst_LIBRARIES = liblyxiconv.a
 
 EXTRA_DIST = \
@@ -32,6 +30,14 @@ EXTRA_DIST = \
        1.14/libcharset/lib/ref-add.sin \
        1.14/libcharset/lib/ref-del.sin
 
+AM_CPPFLAGS += -I$(srcdir)/1.14/srclib -DLIBDIR=""
+
+# The two relocatable.c files confuse automake < 1.14, where we do not use
+# subdir-objects. Therefore we cannot put both in liblyxiconv_a_SOURCES
+# (they would both create the same .o file). Fortunately their contents is
+# identical, so it is enough to build only one.
+EXTRA_DIST += 1.14/libcharset/lib/relocatable.c
+
 liblyxiconv_a_SOURCES = \
        1.14/include/export.h \
        1.14/lib/aliases2.h \
@@ -258,7 +264,6 @@ liblyxiconv_a_SOURCES = \
        1.14/lib/viscii.h \
        1.14/libcharset/include/export.h \
        1.14/libcharset/lib/localcharset.c \
-       1.14/libcharset/lib/relocatable.c \
        1.14/libcharset/lib/relocatable.h \
        1.14/srclib/localcharset.h \
        1.14/srclib/unitypes.in.h \