X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=70bbee266ea5b26f5b416553b486146749dc91db;hb=69726b832b4ed1859d5c9e753c4437c98f5f2966;hp=ed6af579d18f2204306fce362fcd49db24517652;hpb=b7909e7e6ce001e39424d4825383e1bf619acd0c;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index ed6af579d1..70bbee266e 100644
--- 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,20 +20,24 @@ CLEANFILES = $(MOCEDFILES)
 BUILT_SOURCES = $(MOCEDFILES)
 
 moc_%.cpp: %.h
-	$(QT_MOC) -o $@ $<
+	$(AM_V_GEN)$(QT_MOC) -o $@ $<
 
 liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
 #
 ##################################################################
 
-AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES)
+AM_CPPFLAGS += -I$(srcdir)/.. \
+	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) \
+	$(QT_CPPFLAGS) $(QT_INCLUDES)
 
 liblyxsupport_a_SOURCES = \
 	FileMonitor.h \
 	FileMonitor.cpp \
 	RandomAccessList.h \
 	bind.h \
+	Cache.h \
+	Changer.h \
 	ConsoleApplication.cpp \
 	ConsoleApplication.h \
 	ConsoleApplicationPrivate.h \
@@ -54,7 +59,6 @@ liblyxsupport_a_SOURCES = \
 	FileNameList.h \
 	filetools.cpp \
 	filetools.h \
-	foreach.h \
 	ForkedCalls.cpp \
 	ForkedCalls.h \
 	functional.h \
@@ -70,6 +74,7 @@ liblyxsupport_a_SOURCES = \
 	lstrings.h \
 	lyxalgo.h \
 	lyxlib.h \
+	lyxmagic.h \
 	lyxtime.cpp \
 	lyxtime.h \
 	mutex.h \
@@ -88,13 +93,14 @@ liblyxsupport_a_SOURCES = \
 	qstring_helpers.cpp \
 	qstring_helpers.h \
 	regex.h \
+	RefChanger.h \
+	signals.h \
 	socktools.cpp \
 	socktools.h \
 	strfwd.h \
 	Systemcall.cpp \
 	Systemcall.h \
 	SystemcallPrivate.h \
-	shared_ptr.h \
 	TempFile.cpp \
 	TempFile.h \
 	textutils.h \
@@ -104,17 +110,12 @@ liblyxsupport_a_SOURCES = \
 	trivstring.cpp \
 	trivstring.h \
 	types.h \
+	unique_ptr.h \
 	userinfo.cpp \
 	userinfo.h \
 	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 += \
@@ -163,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@