X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FMakefile.am;h=fac0e31bc19eb705476b7b3f63773e8b82ca1de9;hb=27f1f8a94857b147fcd5097351ec2fb070c2966e;hp=93b37be04d899a8395931d38e51f79196a12ce8c;hpb=9734ab7e34b0c293a282e1bc4fb575c4d2afc7e1;p=lyx.git diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 93b37be04d..fac0e31bc1 100644 --- 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,13 +31,11 @@ SOURCEFILES = \ boost.cpp \ client.cpp -HEADERFILES = +HEADERFILES = lyxclient.cpp: - @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@ - -EXTRA_DIST += pch.h + $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@ if MONOLITHIC_CLIENT @@ -49,9 +47,6 @@ lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES) else -AM_CPPFLAGS += $(PCH_FLAGS) -BUILT_SOURCES = $(PCH_FILE) - lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES) endif