Maintain plain layout for separating paragraphs when switching layouts (#11936)

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index fe8eb947611be8adac0d663ecfa48ad34c65e403..8b7d211fa0a95594219653b375d5d917a13f6f96 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -20,7 +20,7 @@ CLEANFILES = $(MOCEDFILES)
 BUILT_SOURCES = $(MOCEDFILES)
 
 moc_%.cpp: %.h
-       $(QT_MOC) -o $@ $<
+       $(AM_V_GEN)$(QT_MOC) -o $@ $<
 
 liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -44,6 +44,8 @@ liblyxsupport_a_SOURCES = \
        convert.cpp \
        convert.h \
        copied_ptr.h \
+       counter_reps.cpp \
+       counter_reps.h \
        debug.cpp \
        debug.h \
        docstream.cpp \
@@ -69,11 +71,15 @@ liblyxsupport_a_SOURCES = \
        kill.cpp \
        lassert.h \
        lassert.cpp \
+       Length.cpp \
+       Length.h \
+       lengthcommon.cpp \
        limited_stack.h \
        lstrings.cpp \
        lstrings.h \
        lyxalgo.h \
        lyxlib.h \
+       lyxmagic.h \
        lyxtime.cpp \
        lyxtime.h \
        mutex.h \
@@ -93,6 +99,7 @@ liblyxsupport_a_SOURCES = \
        qstring_helpers.h \
        regex.h \
        RefChanger.h \
+       signals.h \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -162,7 +169,11 @@ check_PROGRAMS = \
        check_trivstring
 
 if INSTALL_MACOSX
-ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework ApplicationServices
+ADD_FRAMEWORKS = \
+       -framework QtCore -framework AppKit -framework ApplicationServices \
+       -Wl,-rpath,@loader_path/../Frameworks \
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
 check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@