Amend b280fed1: 3rdparty/dtl: Use preprocessor value on Windows

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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index f1d766bd26c30b10d4622acdf3a9f0c68565ca90..c72d51aefbaf2ca14c5c1e42daaa11f73e6c4d83 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -17,7 +17,10 @@ lyxclient_LDADD = \
        $(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
 
 SOURCEFILES = \
@@ -26,21 +29,5 @@ SOURCEFILES = \
 
 HEADERFILES =
 
-
-lyxclient.cpp:
-       $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
-
-if MONOLITHIC_CLIENT
-
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
-BUILT_SOURCES = lyxclient.cpp
-CLEANFILES += lyxclient.cpp
-
-nodist_lyxclient_SOURCES = lyxclient.cpp
-lyxclient_SOURCES = $(HEADERFILES)
-
-else
-
 lyxclient_SOURCES = $(SOURCEFILES) $(HEADERFILES)
 
-endif