Fix bug #12561

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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 83c31265b5e6684bb51dca80d8078e3b9daabc6f..580556d6b14fe8d58b5e57fe011b02772b319ca8 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -8,45 +8,26 @@ bin_PROGRAMS = lyxclient
 
 EXTRA_DIST = lyxclient.1in CMakeLists.txt
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. \
+       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) $(NOD_INCLUDES)
 
 lyxclient_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(BOOST_LIBS) @LIBS@ $(SOCKET_LIBS) \
+       @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
        $(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
-lyxclient_LDFLAGS = -framework AppKit
+lyxclient_LDFLAGS = -framework AppKit \
+       -Wl,-rpath,@loader_path/../Frameworks \
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
-# 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.
-
 SOURCEFILES = \
   boost.cpp \
   client.cpp
 
 HEADERFILES =
 
-
-lyxclient.cpp:
-       @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
-
-if MONOLITHIC_CLIENT
-
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
-BUILT_SOURCES = lyxclient.cpp
-CLEANFILES += lyxclient.cpp
-
-lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
-
-else
-
 lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
 
-endif