X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FMakefile.am;h=d652f0f696bd492d5a1750b0993fc61cda6291e4;hb=f7be88ce4c2bbc10c4691e614a54fca427a2e8fb;hp=c35a5001c79a081a2029bb58c70bf429f478f8ce;hpb=eb00187fea56bdcb940131f5c99da9fa3e01ab35;p=lyx.git

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index c35a5001c7..d652f0f696 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,35 +1,56 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = lyxclient.man
+CLEANFILES += $(man_MANS)
 
 man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+EXTRA_DIST = lyxclient.1in CMakeLists.txt
 
-AM_CXXFLAGS = $(PCH_FLAGS)
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
 
-if USE_INCLUDED_BOOST
-BOOST_LIBS = $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \
-	$(top_builddir)/boost/libs/regex/src/libboostregex.la
-else
-BOOST_LIBS = -lboost_regex -lboost_filesystem
+lyxclient_LDADD = \
+	$(top_builddir)/src/support/liblyxsupport.a \
+	$(BOOST_LIBS) @LIBS@ $(SOCKET_LIBS) \
+	$(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
+
+if INSTALL_MACOSX
+lyxclient_LDFLAGS = -framework AppKit
 endif
 
-lyxclient_LDADD = \
-	$(top_builddir)/src/support/libsupport.la \
-	$(BOOST_LIBS) $(INTLLIBS)
-
-lyxclient_SOURCES = \
-	boost.C \
-	client.C \
-	debug.C \
-	debug.h \
-	gettext.C \
-	gettext.h \
-	messages.C \
-	messages.h
-
-lyxclient.1:
-	cp -p $(srcdir)/lyxclient.man lyxclient.1
+# 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 = 
+
+
+lyxclient.cpp:
+	@echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+
+if MONOLITHIC_CLIENT
+
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+BUILT_SOURCES = lyxclient.cpp
+CLEANFILES += lyxclient.cpp
+
+lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
+
+else
+
+EXTRA_DIST += pch.h
+AM_CPPFLAGS += $(PCH_FLAGS)
+BUILT_SOURCES = $(PCH_FILE)
+
+lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
+
+endif