X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FMakefile.am;h=fac0e31bc19eb705476b7b3f63773e8b82ca1de9;hb=27f1f8a94857b147fcd5097351ec2fb070c2966e;hp=12a908472d1598d7281ce7a6d08498a99ad861b8;hpb=6d5a52b8e36152cc8a1e37f08848102f2a81c1d6;p=lyx.git

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 12a908472d..fac0e31bc1 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,21 +1,23 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(man_MANS)
+CLEANFILES = $(man_MANS)
 
 man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-EXTRA_DIST = lyxclient.man
+EXTRA_DIST = lyxclient.1in CMakeLists.txt
 
 AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
 
-lyxclient.1:
-	cp -p $(srcdir)/lyxclient.man lyxclient.1
-
 lyxclient_LDADD = \
-	$(top_builddir)/src/support/liblyxsupport.la \
-	$(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) 
+	$(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
 
 # everything below the line containing the single backslashs
 # an ugly hack and needed because of the
@@ -27,32 +29,24 @@ lyxclient_LDADD = \
 
 SOURCEFILES = \
   boost.cpp \
-  client.cpp \
-  debug.cpp \
-  gettext.cpp \
-  Messages.cpp 
+  client.cpp
 
-HEADERFILES = \
-  debug.h \
-  Messages.h 
+HEADERFILES =
 
 
-if MONOLITHIC_CLIENT
-
 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)
 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