DocBook: simplify code to handle abstracts.

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 3a4576c4c9f75e8185e7c732241e891955efcd30..785b97f395bff73e9a6f7f05066fd665f7fa070b 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -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,6 +71,9 @@ liblyxsupport_a_SOURCES = \
        kill.cpp \
        lassert.h \
        lassert.cpp \
+       Length.cpp \
+       Length.h \
+       lengthcommon.cpp \
        limited_stack.h \
        lstrings.cpp \
        lstrings.h \
@@ -117,12 +122,6 @@ liblyxsupport_a_SOURCES = \
        unicode.h \
        weighted_btree.h
 
-#if INSTALL_MACOSX
-#liblyxsupport_a_SOURCES += \
-#      AppleSpellChecker.h \
-#      AppleSpellChecker.mm
-#endif
-
 if INSTALL_MACOSX
 liblyxsupport_a_SOURCES += \
        AppleSpeller.h \
@@ -130,6 +129,8 @@ liblyxsupport_a_SOURCES += \
        AppleScript.h \
        AppleScript.m \
        AppleScriptProxy.cpp \
+       AppleSupport.h \
+       AppleSupport.m \
        linkback/LinkBack.h \
        linkback/LinkBack.m \
        linkback/LinkBackProxy.h \
@@ -164,7 +165,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@