X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=d3c902cc8e349703de0d755d563ac2feffbc3ff8;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=3e69f53f008bb50ac22ab11e069a158c6dabf52f;hpb=63d19999ebd5ba5c8a7d9e25a2d58c8f990cff1c;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 3e69f53f00..d3c902cc8e 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,32 +1,48 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(BUILT_SOURCES)
+EXTRA_DIST = os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+	CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
 
-EXTRA_DIST = pch.h \
-	os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
+noinst_LIBRARIES = liblyxsupport.a
 
-noinst_LTLIBRARIES = liblyxsupport.la
 
-liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS)
-liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)
+#########################  Qt stuff  #############################
+#
 
-BUILT_SOURCES = $(PCH_FILE)
+MOCHEADER = \
+	ConsoleApplicationPrivate.h \
+	FileMonitor.h \
+	SystemcallPrivate.h
+
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+
+CLEANFILES = $(MOCEDFILES)
+BUILT_SOURCES = $(MOCEDFILES)
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip
+moc_%.cpp: %.h
+	$(AM_V_GEN)$(QT_MOC) -o $@ $<
 
-# force the use of C++ compiler for minizip/*.c files, because
-# gcc can not go through the included boost files.
-liblyxsupport_la_CFLAGS = -x c++
+liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES)
 
-liblyxsupport_la_SOURCES = \
+#
+##################################################################
+
+AM_CPPFLAGS += -I$(srcdir)/.. \
+	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) \
+	$(QT_CPPFLAGS) $(QT_INCLUDES)
+
+liblyxsupport_a_SOURCES = \
 	FileMonitor.h \
 	FileMonitor.cpp \
 	RandomAccessList.h \
-	abort.cpp \
+	bind.h \
+	Cache.h \
+	Changer.h \
+	ConsoleApplication.cpp \
+	ConsoleApplication.h \
+	ConsoleApplicationPrivate.h \
 	convert.cpp \
 	convert.h \
-	copy.cpp \
 	copied_ptr.h \
 	debug.cpp \
 	debug.h \
@@ -34,23 +50,25 @@ liblyxsupport_la_SOURCES = \
 	docstream.h \
 	docstring.cpp \
 	docstring.h \
+	docstring_list.h \
 	environment.h \
 	environment.cpp \
 	ExceptionMessage.h \
-	FileFilterList.cpp \
-	FileFilterList.h \
 	FileName.cpp \
 	FileName.h \
+	FileNameList.h \
 	filetools.cpp \
 	filetools.h \
 	ForkedCalls.cpp \
 	ForkedCalls.h \
+	functional.h \
 	gettext.cpp \
 	gettext.h \
-	getcwd.cpp \
 	gzstream.cpp \
 	gzstream.h \
 	kill.cpp \
+	lassert.h \
+	lassert.cpp \
 	limited_stack.h \
 	lstrings.cpp \
 	lstrings.h \
@@ -58,46 +76,66 @@ liblyxsupport_la_SOURCES = \
 	lyxlib.h \
 	lyxtime.cpp \
 	lyxtime.h \
-	lyxsum.cpp \
+	mutex.h \
+	mutex.cpp \
 	Messages.cpp \
 	Messages.h \
-	mkdir.cpp \
+	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 \
-	rename.cpp \
+	regex.h \
+	RefChanger.h \
+	signals.h \
 	socktools.cpp \
 	socktools.h \
 	strfwd.h \
 	Systemcall.cpp \
 	Systemcall.h \
-	SignalSlot.cpp \
-	SignalSlot.h \
-	SignalSlotPrivate.h \
-	tempname.cpp \
+	SystemcallPrivate.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 \
-	minizip/crypt.h \
-	minizip/ioapi.c \
-	minizip/ioapi.h \
-	minizip/iowin32.c \
-	minizip/iowin32.h \
-	minizip/unzip.c \
-	minizip/unzip.h \
-	minizip/zip.c \
-	minizip/zip.h \
-	minizip/zipunzip.cpp
+	weighted_btree.h
+
+#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 \
+	linkback/LinkBackProxy.m \
+	linkback/LinkBackServer.h \
+	linkback/LinkBackServer.m
+endif
 
 ############################## Tests ##################################
 
@@ -105,41 +143,58 @@ 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 = \
-	test_convert \
-	test_filetools \
-	test_lstrings
+	tests/test_convert \
+	tests/test_filetools \
+	tests/test_lstrings \
+	tests/test_trivstring
 
 check_PROGRAMS = \
 	check_convert \
 	check_filetools \
-	check_lstrings
+	check_lstrings \
+	check_trivstring
+
+if INSTALL_MACOSX
+ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework ApplicationServices
+endif
 
-check_convert_LDADD = ../debug.o convert.o docstring.o lstrings.o unicode.o \
-	$(BOOST_LIBS) $(QT4_CORE_LIB)
-check_convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
+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 = ../debug.o libsupport.la $(BOOST_LIBS)
+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 = ../debug.o lstrings.o convert.o docstring.o unicode.o \
-	$(QT4_CORE_LIB)
-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}/regfiles/$$all ; \
+		./$$all > ${srcdir}/tests/regfiles/$$all ; \
 	done