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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index ab353b497b..70bbee266e 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,40 +1,46 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(BUILT_SOURCES)
-
-EXTRA_DIST = pch.h \
-	os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
+EXTRA_DIST = os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+	CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
 
 noinst_LIBRARIES = liblyxsupport.a
 
-BUILT_SOURCES = $(PCH_FILE)
 
 #########################  Qt stuff  #############################
 #
 
-MOCHEADER = SystemcallPrivate.h
+MOCHEADER = \
+	ConsoleApplicationPrivate.h \
+	FileMonitor.h \
+	SystemcallPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-CLEANFILES += $(MOCEDFILES)
-BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES = $(MOCEDFILES)
+BUILT_SOURCES = $(MOCEDFILES)
 
 moc_%.cpp: %.h
-	$(MOC4) -o $@ $<
+	$(AM_V_GEN)$(QT_MOC) -o $@ $<
 
 liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
 #
 ##################################################################
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_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 \
 	convert.cpp \
 	convert.h \
 	copied_ptr.h \
@@ -53,7 +59,6 @@ liblyxsupport_a_SOURCES = \
 	FileNameList.h \
 	filetools.cpp \
 	filetools.h \
-	foreach.h \
 	ForkedCalls.cpp \
 	ForkedCalls.h \
 	functional.h \
@@ -69,6 +74,7 @@ liblyxsupport_a_SOURCES = \
 	lstrings.h \
 	lyxalgo.h \
 	lyxlib.h \
+	lyxmagic.h \
 	lyxtime.cpp \
 	lyxtime.h \
 	mutex.h \
@@ -87,31 +93,29 @@ 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 \
 	Translator.h \
 	Timeout.cpp \
 	Timeout.h \
+	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 += \
@@ -140,42 +144,61 @@ EXTRA_DIST += \
 	tests/test_convert \
 	tests/test_filetools \
 	tests/test_lstrings \
+	tests/test_trivstring \
 	tests/regfiles/convert \
 	tests/regfiles/filetools \
-	tests/regfiles/lstrings
+	tests/regfiles/lstrings \
+	tests/regfiles/trivstring
 
 
 TESTS = \
 	tests/test_convert \
 	tests/test_filetools \
-	tests/test_lstrings
+	tests/test_lstrings \
+	tests/test_trivstring
 
 check_PROGRAMS = \
 	check_convert \
 	check_filetools \
-	check_lstrings
+	check_lstrings \
+	check_trivstring
 
-check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_convert_LDFLAGS = $(QT4_LDFLAGS)
+if INSTALL_MACOSX
+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_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) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_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) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_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_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_trivstring_SOURCES = \
+	tests/check_trivstring.cpp \
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
+
 makeregfiles: ${check_PROGRAMS}
 	for all in ${check_PROGRAMS} ; do \
 		./$$all > ${srcdir}/tests/regfiles/$$all ; \