X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=15a3dfa49615c6a762bbd1967b99241c089940d1;hb=66c5d055e776e0cd08fb35c164b49d9ccc7812b7;hp=d924a5eb0287484b5932347df9bb9bc8fd7f3551;hpb=d9c0807227a9bdff2d28a80181d0e7ec5532ba1e;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index d924a5eb02..15a3dfa496 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,16 +27,17 @@ OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
+lyx_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
+
 lyx_LDADD = \
 	liblyxcore.a \
 	liblyxmathed.a \
 	liblyxinsets.a \
 	frontends/liblyxfrontends.a \
-	frontends/qt4/liblyxqt4.a \
+	frontends/qt/liblyxqt.a \
 	liblyxgraphics.a \
 	support/liblyxsupport.a \
 	$(OTHERLIBS) \
-	$(QT_LDFLAGS) \
 	$(QT_LIB)
 
 if LYX_WIN_RESOURCE
@@ -46,7 +47,7 @@ if LYX_WIN_RESOURCE
 endif
 
 if INSTALL_MACOSX
-lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
+lyx_LDFLAGS += -framework AppKit -framework ApplicationServices \
 	-Wl,-rpath,@loader_path/../Frameworks \
 	-Wl,-rpath,@executable_path/../Frameworks \
 	-Wl,-headerpad_max_install_names