X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FMakefile.am;h=f1d766bd26c30b10d4622acdf3a9f0c68565ca90;hb=242f543e01a5ddc0de3f0d041e412311463c8baa;hp=fac0e31bc19eb705476b7b3f63773e8b82ca1de9;hpb=890a1efe4732cc6241ddf220341bc3d794929442;p=lyx.git

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index fac0e31bc1..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)
+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
 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
@@ -39,11 +32,12 @@ lyxclient.cpp:
 
 if MONOLITHIC_CLIENT
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+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