Do not output deleted rows columns if show changes in output is false

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d924a5eb0287484b5932347df9bb9bc8fd7f3551..15a3dfa49615c6a762bbd1967b99241c089940d1 100644 (file)
--- 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