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 958b46594bf645db1fc3176bde02b087ff8a7d15..f1d766bd26c30b10d4622acdf3a9f0c68565ca90 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,44 +1,46 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(man_MANS)
-
-EXTRA_DIST = pch.h lyxclient.man
-
-BUILT_SOURCES = $(PCH_FILE)
+CLEANFILES = $(man_MANS)
 
 man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+EXTRA_DIST = lyxclient.1in CMakeLists.txt
+
+AM_CPPFLAGS += -I$(srcdir)/.. \
+       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 lyxclient_LDADD = \
-       $(top_builddir)/src/support/liblyxsupport.la \
-       $(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) 
-
-# everything below the line containing a single backslash and the 
-# spellchecker stuff is 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.
-
-lyxclient_SOURCES = \
+       $(top_builddir)/src/support/liblyxsupport.a \
+       $(BOOST_LIBS) @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
+       $(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
+
+if INSTALL_MACOSX
+lyxclient_LDFLAGS = -framework AppKit
+endif
+
+SOURCEFILES = \
   boost.cpp \
-  client.cpp \
-  debug.cpp \
-  debug.h \
-  gettext.cpp \
-  Messages.cpp \
-  Messages.h \
-       \
-       ../Box.cpp \
-       ../Box.h \
-       ../Dimension.cpp \
-       ../Dimension.h \
-       ../PrinterParams.cpp \
-       ../PrinterParams.h 
-
-lyxclient.1:
-       cp -p $(srcdir)/lyxclient.man lyxclient.1
+  client.cpp
+
+HEADERFILES =
+
+
+lyxclient.cpp:
+       $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
+
+if MONOLITHIC_CLIENT
+
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
+BUILT_SOURCES = lyxclient.cpp
+CLEANFILES += lyxclient.cpp
+
+nodist_lyxclient_SOURCES = lyxclient.cpp
+lyxclient_SOURCES = $(HEADERFILES)
+
+else
+
+lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
+
+endif