X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=925cb62d04fee19b88766952432adbdfd52bbfd3;hb=5cb80b867f4a59c3253487652ba74a29ad5b3f0f;hp=9865d6fe2def73661bd09ca6f2edeee2e32bf6aa;hpb=b250eb5a4696c7809d5c1cf83ccc015f707d993c;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 9865d6fe2d..925cb62d04 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -29,21 +29,26 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
 AM_CPPFLAGS += -I$(srcdir)/.. \
 	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) \
-	$(QT_CPPFLAGS) $(QT_INCLUDES)
+	$(NOD_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES)
 
 liblyxsupport_a_SOURCES = \
 	FileMonitor.h \
 	FileMonitor.cpp \
 	RandomAccessList.h \
+	any.h \
 	bind.h \
 	Cache.h \
 	Changer.h \
+	checksum.cpp \
+	checksum.h \
 	ConsoleApplication.cpp \
 	ConsoleApplication.h \
 	ConsoleApplicationPrivate.h \
 	convert.cpp \
 	convert.h \
 	copied_ptr.h \
+	counter_reps.cpp \
+	counter_reps.h \
 	debug.cpp \
 	debug.h \
 	docstream.cpp \
@@ -69,11 +74,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 \
@@ -91,8 +100,7 @@ liblyxsupport_a_SOURCES = \
 	pmprof.h \
 	qstring_helpers.cpp \
 	qstring_helpers.h \
-	regex.h \
-	RefChanger.h \
+	signals.h \
 	socktools.cpp \
 	socktools.h \
 	strfwd.h \
@@ -115,12 +123,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 \
@@ -128,6 +130,8 @@ liblyxsupport_a_SOURCES += \
 	AppleScript.h \
 	AppleScript.m \
 	AppleScriptProxy.cpp \
+	AppleSupport.h \
+	AppleSupport.m \
 	linkback/LinkBack.h \
 	linkback/LinkBack.m \
 	linkback/LinkBackProxy.h \
@@ -162,31 +166,35 @@ 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@
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
 check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_convert_SOURCES = \
 	tests/check_convert.cpp \
 	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
 check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_filetools_SOURCES = \
 	tests/check_filetools.cpp \
 	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
 check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_lstrings_SOURCES = \
 	tests/check_lstrings.cpp \
 	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
 check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_trivstring_SOURCES = \
 	tests/check_trivstring.cpp \