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 a63bb89681c09ed01398e548344a126464f78ade..785b97f395bff73e9a6f7f05066fd665f7fa070b 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -11,6 +11,7 @@ noinst_LIBRARIES = liblyxsupport.a
 
 MOCHEADER = \
        ConsoleApplicationPrivate.h \
+       FileMonitor.h \
        SystemcallPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
@@ -19,7 +20,7 @@ CLEANFILES = $(MOCEDFILES)
 BUILT_SOURCES = $(MOCEDFILES)
 
 moc_%.cpp: %.h
-       $(QT_MOC) -o $@ $<
+       $(AM_V_GEN)$(QT_MOC) -o $@ $<
 
 liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -43,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 \
@@ -68,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 \
@@ -92,6 +99,7 @@ liblyxsupport_a_SOURCES = \
        qstring_helpers.h \
        regex.h \
        RefChanger.h \
+       signals.h \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -113,18 +121,6 @@ liblyxsupport_a_SOURCES = \
        unicode.cpp \
        unicode.h \
        weighted_btree.h
-if USE_INCLUDED_MYTHES
-liblyxsupport_a_SOURCES += \
-       mythes/mythes.cxx \
-       mythes/mythes.hxx \
-       mythes/license.readme
-endif
-
-#if INSTALL_MACOSX
-#liblyxsupport_a_SOURCES += \
-#      AppleSpellChecker.h \
-#      AppleSpellChecker.mm
-#endif
 
 if INSTALL_MACOSX
 liblyxsupport_a_SOURCES += \
@@ -133,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 \
@@ -167,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@