Fix linking on Mac OS X when using autotools without the fancy mac build script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40322 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a38664d964794adafb10791f76d88cf36aa78a1..b1f88697211ada1c464396e701e8cd3794a4e0cf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,10 @@ if LYX_WIN_RESOURCE
        windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
+if INSTALL_MACOSX
+lyx_LDFLAGS = -framework AppKit
+endif
+
 #lyx_LDFLAGS=-Wl,-O1
 
 BUILT_SOURCES = $(PCH_FILE)

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 49ded9fd651317b32f6c4e38a648629be13b6930..e68cad20d4a8c64f30540e292b1e6a483cfa974b 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -15,6 +15,10 @@ lyxclient_LDADD = \
        $(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) \
        $(QT4_LIB) $(QT4_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
 
+if INSTALL_MACOSX
+lyxclient_LDFLAGS = -framework AppKit
+endif
+
 # everything below the line containing the single backslashs
 # an ugly hack and needed because of the
 # linking problems described in ../Makefile.am

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 8020d02d3420e31d3d0ac03332851a8ad69245f4..fc39503b90218ccaded5bedb47dfc2403590d778 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -68,3 +68,7 @@ tex2lyx_LDADD = \
        $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
        $(QT4_LIB) $(QT4_LDFLAGS) \
        @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
+
+if INSTALL_MACOSX
+tex2lyx_LDFLAGS = -framework AppKit
+endif

diff --git a/status.20x b/status.20x
index 0cb661343e1fc6a065c0b206cac80e5c816ca600..3478f075f749dc47e5514015e638518d91274eea 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -67,3 +67,5 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Fix link problem when compiling on Mac OS X with plain autotools.
+