From d45fdbc3c6e5d2e35851ab94226fb03897f2643a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 30 Nov 2011 11:19:57 +0000 Subject: [PATCH] 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 --- src/Makefile.am | 4 ++++ src/client/Makefile.am | 4 ++++ src/tex2lyx/Makefile.am | 4 ++++ status.20x | 2 ++ 4 files changed, 14 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 6a38664d96..b1f8869721 100644 --- 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 49ded9fd65..e68cad20d4 100644 --- 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 8020d02d34..fc39503b90 100644 --- 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 0cb661343e..3478f075f7 100644 --- 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. + -- 2.39.5