X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=ed6af579d18f2204306fce362fcd49db24517652;hb=f16b2cab75752e7b0fbec5520e231b068eb29072;hp=2d910d7829d62f94ac0b2057ba19720be08b4313;hpb=35e1157317931babf8ce692952d3ff20d6946c0b;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 2d910d7829..ed6af579d1 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,84 +1,200 @@
 include $(top_srcdir)/config/common.am
 
-noinst_LTLIBRARIES = libsupport.la
+EXTRA_DIST = os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+	CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
 
-INCLUDES = -I${srcdir}/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
+noinst_LIBRARIES = liblyxsupport.a
 
-EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \
-             os_unix.C os_win32.C os_os2.C
 
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
-endif
-if USE_REGEX
-REGEX = regex.c lyxregex.h
-endif
+#########################  Qt stuff  #############################
+#
 
-libsupport_la_SOURCES = \
-	DebugStream.C \
-	DebugStream.h \
-	FileInfo.C \
-	FileInfo.h \
-	LAssert.C \
-	LAssert.h \
-	LIstream.h \
-	LOstream.h \
-	LRegex.C \
-	LRegex.h \
-	LSubstring.C \
-	LSubstring.h \
-	os.C \
-	os.h \
-	StrPool.C \
-	StrPool.h \
-	abort.C \
-	atoi.C \
-	chdir.C \
-	copy.C \
-	date.C \
-	filetools.C \
+MOCHEADER = \
+	ConsoleApplicationPrivate.h \
+	SystemcallPrivate.h
+
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+
+CLEANFILES = $(MOCEDFILES)
+BUILT_SOURCES = $(MOCEDFILES)
+
+moc_%.cpp: %.h
+	$(QT_MOC) -o $@ $<
+
+liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
+
+#
+##################################################################
+
+AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(QT_CPPFLAGS) $(QT_INCLUDES)
+
+liblyxsupport_a_SOURCES = \
+	FileMonitor.h \
+	FileMonitor.cpp \
+	RandomAccessList.h \
+	bind.h \
+	ConsoleApplication.cpp \
+	ConsoleApplication.h \
+	ConsoleApplicationPrivate.h \
+	convert.cpp \
+	convert.h \
+	copied_ptr.h \
+	debug.cpp \
+	debug.h \
+	docstream.cpp \
+	docstream.h \
+	docstring.cpp \
+	docstring.h \
+	docstring_list.h \
+	environment.h \
+	environment.cpp \
+	ExceptionMessage.h \
+	FileName.cpp \
+	FileName.h \
+	FileNameList.h \
+	filetools.cpp \
 	filetools.h \
-	fmt.C \
-	forkedcall.C \
-	forkedcall.h \
-	forkedcontr.C \
-	forkedcontr.h \
-	getUserName.C \
-	getcwd.C \
-	kill.C \
-	lstrings.C \
+	foreach.h \
+	ForkedCalls.cpp \
+	ForkedCalls.h \
+	functional.h \
+	gettext.cpp \
+	gettext.h \
+	gzstream.cpp \
+	gzstream.h \
+	kill.cpp \
+	lassert.h \
+	lassert.cpp \
+	limited_stack.h \
+	lstrings.cpp \
 	lstrings.h \
-	lxtl.h \
 	lyxalgo.h \
-	lyxfunctional.h \
 	lyxlib.h \
-	lyxmanip.h \
-	$(LYXSTRING) lyxsum.C \
-	mkdir.C \
-	nt_defines.h \
-	os2_defines.h \
-	os2_errortable.h \
-	path.C \
-	path.h \
-	putenv.C \
-	rename.C \
-	rmdir.C \
-	smart_ptr.h \
-	snprintf.h \
-	snprintf.c \
-	sstream.h \
-	$(REGEX) systemcall.C \
-	systemcall.h \
-	tempname.C \
+	lyxtime.cpp \
+	lyxtime.h \
+	mutex.h \
+	mutex.cpp \
+	Messages.cpp \
+	Messages.h \
+	numpunct_lyx_char_type.h \
+	os.cpp \
+	os.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 \
+	Translator.h \
+	Timeout.cpp \
+	Timeout.h \
+	trivstring.cpp \
+	trivstring.h \
 	types.h \
-	unlink.C \
-	utility.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 USE_LD_R
-libsupport.la: libsupport.o
+#if INSTALL_MACOSX
+#liblyxsupport_a_SOURCES += \
+#	AppleSpellChecker.h \
+#	AppleSpellChecker.mm
+#endif
 
-libsupport.o: $(libsupport_la_OBJECTS) $(libsupport_la_DEPENDENCIES)
-	$(CXXLINK) $(libsupport_la_OBJECTS)
+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 \
+	linkback/LinkBackProxy.m \
+	linkback/LinkBackServer.h \
+	linkback/LinkBackServer.m
 endif
+
+############################## Tests ##################################
+
+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/trivstring
+
+
+TESTS = \
+	tests/test_convert \
+	tests/test_filetools \
+	tests/test_lstrings \
+	tests/test_trivstring
+
+check_PROGRAMS = \
+	check_convert \
+	check_filetools \
+	check_lstrings \
+	check_trivstring
+
+if INSTALL_MACOSX
+ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework ApplicationServices
+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) $(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_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 ; \
+	done