Configure included iconv with autotools

[features.git] / src / client / Makefile.am

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 83c31265b5e6684bb51dca80d8078e3b9daabc6f..3874376ab4fecdba9136672d6f5de0e95586a3fd 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -8,11 +8,12 @@ bin_PROGRAMS = lyxclient
 
 EXTRA_DIST = lyxclient.1in CMakeLists.txt
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. \
+       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 lyxclient_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(BOOST_LIBS) @LIBS@ $(SOCKET_LIBS) \
+       $(BOOST_LIBS) @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
        $(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
@@ -35,11 +36,11 @@ HEADERFILES =
 
 
 lyxclient.cpp:
-       @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+       $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
 
 if MONOLITHIC_CLIENT
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
 BUILT_SOURCES = lyxclient.cpp
 CLEANFILES += lyxclient.cpp