Remove a sometimes blocked call to dispatch

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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index d3c4da45d561f220cbc33894c49ae2d5c38d5935..f1d766bd26c30b10d4622acdf3a9f0c68565ca90 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,56 +1,46 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(man_MANS)
+CLEANFILES = $(man_MANS)
 
 man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-EXTRA_DIST = lyxclient.1in
+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) \
-       $(QT4_LIB) $(QT4_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
+       $(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
 
-HEADERFILES = 
+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
 
-lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
+nodist_lyxclient_SOURCES = lyxclient.cpp
+lyxclient_SOURCES = $(HEADERFILES)
 
 else
 
-EXTRA_DIST += pch.h
-AM_CPPFLAGS += $(PCH_FLAGS)
-BUILT_SOURCES = $(PCH_FILE)
-
 lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
 
 endif