Win installer: translate 2 installer sections

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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index d3c4da45d561f220cbc33894c49ae2d5c38d5935..fac0e31bc19eb705476b7b3f63773e8b82ca1de9 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,19 +1,19 @@
 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)
 
 lyxclient_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
        $(BOOST_LIBS) @LIBS@ $(SOCKET_LIBS) \
-       $(QT4_LIB) $(QT4_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
+       $(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
 lyxclient_LDFLAGS = -framework AppKit
@@ -31,11 +31,11 @@ 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
 
@@ -47,10 +47,6 @@ lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
 
 else
 
-EXTRA_DIST += pch.h
-AM_CPPFLAGS += $(PCH_FLAGS)
-BUILT_SOURCES = $(PCH_FILE)
-
 lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
 
 endif