Fix bug #4269

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index e816c6fda911d541d5c89b110b068b0903fd437a..70bbee266ea5b26f5b416553b486146749dc91db 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -11,7 +11,7 @@ noinst_LIBRARIES = liblyxsupport.a
 
 MOCHEADER = \
        ConsoleApplicationPrivate.h \
-       FileMonitor2.h \
+       FileMonitor.h \
        SystemcallPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
@@ -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)
 
@@ -34,8 +34,6 @@ AM_CPPFLAGS += -I$(srcdir)/.. \
 liblyxsupport_a_SOURCES = \
        FileMonitor.h \
        FileMonitor.cpp \
-       FileMonitor2.h \
-       FileMonitor2.cpp \
        RandomAccessList.h \
        bind.h \
        Cache.h \
@@ -76,6 +74,7 @@ liblyxsupport_a_SOURCES = \
        lstrings.h \
        lyxalgo.h \
        lyxlib.h \
+       lyxmagic.h \
        lyxtime.cpp \
        lyxtime.h \
        mutex.h \
@@ -95,6 +94,7 @@ liblyxsupport_a_SOURCES = \
        qstring_helpers.h \
        regex.h \
        RefChanger.h \
+       signals.h \
        socktools.cpp \
        socktools.h \
        strfwd.h \
@@ -164,7 +164,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@