X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FMakefile.am;h=f1d766bd26c30b10d4622acdf3a9f0c68565ca90;hb=acc1cc394fd53747983be156b78736c0a4d8e9ff;hp=131c56a6c38e9dc0d482e215b871913cca255518;hpb=78e17b1579d4f9282deccd905ad613b3f06abb31;p=lyx.git

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 131c56a6c3..f1d766bd26 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -8,25 +8,18 @@ bin_PROGRAMS = lyxclient
 
 EXTRA_DIST = lyxclient.1in CMakeLists.txt
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. \
+	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 lyxclient_LDADD = \
 	$(top_builddir)/src/support/liblyxsupport.a \
-	$(BOOST_LIBS) @LIBS@ $(ZLIB_LIBS) $(SOCKET_LIBS) \
+	$(BOOST_LIBS) @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
 	$(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
 lyxclient_LDFLAGS = -framework AppKit
 endif
 
-# everything below the line containing the single backslashs
-# an ugly hack and needed because of the
-# linking problems described in ../Makefile.am
-# These four objects are linked as object files as they are not
-# referenced within the core and therefore are not picked up
-# by the linker without looping over libs. We do not want that,
-# and in fact libtools seems not able to do that.
-
 SOURCEFILES = \
   boost.cpp \
   client.cpp
@@ -43,7 +36,8 @@ AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
 BUILT_SOURCES = lyxclient.cpp
 CLEANFILES += lyxclient.cpp
 
-lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
+nodist_lyxclient_SOURCES = lyxclient.cpp
+lyxclient_SOURCES = $(HEADERFILES)
 
 else