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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index a60554dafd..ab353b497b 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -28,7 +28,7 @@ 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 \
@@ -61,8 +61,6 @@ liblyxsupport_a_SOURCES = \
 	gettext.h \
 	gzstream.cpp \
 	gzstream.h \
-	InGuiThread.h \
-	InGuiThread.cpp \
 	kill.cpp \
 	lassert.h \
 	lassert.cpp \
@@ -73,16 +71,19 @@ 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 \
@@ -93,6 +94,8 @@ liblyxsupport_a_SOURCES = \
 	Systemcall.h \
 	SystemcallPrivate.h \
 	shared_ptr.h \
+	TempFile.cpp \
+	TempFile.h \
 	textutils.h \
 	Translator.h \
 	Timeout.cpp \
@@ -102,10 +105,13 @@ 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 += \
@@ -117,6 +123,9 @@ 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 \
@@ -146,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}