* new function to set border around selection

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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 0d660918d788a3e9eaac8739660d03dbe8b800ba..91beb72e2aaaab8c35b36376fd7588e9eef7a162 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -2,35 +2,57 @@ include $(top_srcdir)/config/common.am
 
 CLEANFILES += $(man_MANS)
 
-EXTRA_DIST = pch.h lyxclient.man
-
-BUILT_SOURCES = $(PCH_FILE)
-
 man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+EXTRA_DIST = lyxclient.man
+
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+
+lyxclient.1:
+       cp -p $(srcdir)/lyxclient.man lyxclient.1
 
 lyxclient_LDADD = \
-       $(top_builddir)/src/liblyxcore.la \
-       $(top_builddir)/src/liblyxinsets.la \
-       $(top_builddir)/src/liblyxmathed.la \
-       $(top_builddir)/src/liblyxgraphics.la \
-       $(top_builddir)/src/frontends/liblyxfrontends.la \
-       $(top_builddir)/src/frontends/controllers/liblyxcontrollers.la \
-       $(top_builddir)/src/frontends/qt4/liblyxqt4.la \
        $(top_builddir)/src/support/liblyxsupport.la \
-       $(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS)
+       $(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) 
+
+# 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.
 
-lyxclient_SOURCES = \
+SOURCEFILES = \
   boost.cpp \
   client.cpp \
   debug.cpp \
-  debug.h \
   gettext.cpp \
-  Messages.cpp \
-  Messages.h
+  Messages.cpp 
 
-lyxclient.1:
-       cp -p $(srcdir)/lyxclient.man lyxclient.1
+HEADERFILES = \
+  debug.h \
+  Messages.h 
+
+
+if MONOLITHIC_CLIENT
+
+client.cpp:
+       @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+BUILT_SOURCES = client.cpp
+ 
+lyxclient_SOURCES = client.cpp $(HEADERFILES)
+
+else
+
+EXTRA_DIST += pch.h
+AM_CPPFLAGS += $(PCH_FLAGS)
+BUILT_SOURCES = $(PCH_FILE)
+
+lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
+
+endif