GuiCharacter: Add menu to Restore button

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 08f1c7180d7fa3a508b1815f4d6d0f61dbf9ab50..1226fbe72a85154eef910b33cab5561873f9d779 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)
 
@@ -35,6 +36,7 @@ liblyxsupport_a_SOURCES = \
        FileMonitor.cpp \
        RandomAccessList.h \
        bind.h \
+       Cache.h \
        Changer.h \
        ConsoleApplication.cpp \
        ConsoleApplication.h \
@@ -91,6 +93,7 @@ liblyxsupport_a_SOURCES = \
        qstring_helpers.h \
        regex.h \
        RefChanger.h \
+       signals.h \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -112,12 +115,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 += \
@@ -166,7 +163,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@