X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=ab353b497beffabf3ce0a64275f6f1880f1cdc85;hb=3f59d7e2cc6a3f9a09631c804b49b6d28e05d857;hp=6917051095a90aea1df53bf9bc3552cf928a7a30;hpb=8f136a546721f54c9792cd490bba4e07f2a072cf;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 6917051095..ab353b497b 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -28,12 +28,13 @@ liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 ##################################################################
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_INCLUDES)
 
 liblyxsupport_a_SOURCES = \
 	FileMonitor.h \
 	FileMonitor.cpp \
 	RandomAccessList.h \
+	bind.h \
 	convert.cpp \
 	convert.h \
 	copied_ptr.h \
@@ -55,6 +56,7 @@ liblyxsupport_a_SOURCES = \
 	foreach.h \
 	ForkedCalls.cpp \
 	ForkedCalls.h \
+	functional.h \
 	gettext.cpp \
 	gettext.h \
 	gzstream.cpp \
@@ -69,23 +71,31 @@ liblyxsupport_a_SOURCES = \
 	lyxlib.h \
 	lyxtime.cpp \
 	lyxtime.h \
+	mutex.h \
+	mutex.cpp \
 	Messages.cpp \
 	Messages.h \
+	numpunct_lyx_char_type.h \
 	os.cpp \
 	os.h \
-	Path.cpp \
-	Path.h \
+	PathChanger.cpp \
+	PathChanger.h \
 	Package.cpp \
 	Package.h \
 	ProgressInterface.h \
+	pmprof.h \
 	qstring_helpers.cpp \
 	qstring_helpers.h \
+	regex.h \
 	socktools.cpp \
 	socktools.h \
 	strfwd.h \
 	Systemcall.cpp \
 	Systemcall.h \
 	SystemcallPrivate.h \
+	shared_ptr.h \
+	TempFile.cpp \
+	TempFile.h \
 	textutils.h \
 	Translator.h \
 	Timeout.cpp \
@@ -95,13 +105,27 @@ liblyxsupport_a_SOURCES = \
 	userinfo.h \
 	unicode.cpp \
 	unicode.h \
-	weighted_btree.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 += \
+	AppleSpeller.h \
+	AppleSpeller.m \
+	AppleScript.h \
+	AppleScript.m \
+	AppleScriptProxy.cpp \
 	linkback/LinkBack.h \
 	linkback/LinkBack.m \
 	linkback/LinkBackProxy.h \
@@ -131,22 +155,25 @@ check_PROGRAMS = \
 	check_filetools \
 	check_lstrings
 
-check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
 check_convert_LDFLAGS = $(QT4_LDFLAGS)
 check_convert_SOURCES = \
 	tests/check_convert.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
 check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_filetools_SOURCES = \
 	tests/check_filetools.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
-check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
 check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 check_lstrings_SOURCES = \
 	tests/check_lstrings.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
 
 makeregfiles: ${check_PROGRAMS}