Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index aff3a129a36fa5205249836c01f5f20c3747fc35..d3c4da45d561f220cbc33894c49ae2d5c38d5935 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -6,17 +6,18 @@ man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-EXTRA_DIST = lyxclient.man
+EXTRA_DIST = lyxclient.1in
 
 AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
 
-lyxclient.1:
-       cp -p $(srcdir)/lyxclient.man lyxclient.1
-
 lyxclient_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) \
-       $(QT4_LIB) $(QT4_LDFLAGS) $(LIBSHLWAPI)
+       $(BOOST_LIBS) @LIBS@ $(SOCKET_LIBS) \
+       $(QT4_LIB) $(QT4_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
@@ -28,12 +29,9 @@ lyxclient_LDADD = \
 
 SOURCEFILES = \
   boost.cpp \
-  client.cpp \
-  gettext.cpp \
-  Messages.cpp
+  client.cpp
 
-HEADERFILES = \
-  Messages.h
+HEADERFILES = 
 
 
 lyxclient.cpp:
@@ -43,6 +41,7 @@ if MONOLITHIC_CLIENT
 
 AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
 BUILT_SOURCES = lyxclient.cpp
+CLEANFILES += lyxclient.cpp
 
 lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)