X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=d1137290ee4646dcf0e6eeb4fb5020f269ee616e;hb=127e5b1955af5edc9000c8c8c9fb40494a5f2096;hp=d442a630e9826152bc74a94b5d6a35a97dfffd38;hpb=468d29423e54e04835510008b74cc46cb397c75a;p=lyx.git diff --git a/src/support/Makefile.am b/src/support/Makefile.am index d442a630e9..d1137290ee 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -1,165 +1,201 @@ 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 = Package.cpp.in pch.h \ - os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h +noinst_LIBRARIES = liblyxsupport.a -pkglib_LTLIBRARIES = liblyxsupport.la -liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS) -liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS) +######################### Qt stuff ############################# +# -BUILT_SOURCES = $(PCH_FILE) Package.cpp +MOCHEADER = \ + ConsoleApplicationPrivate.h \ + SystemcallPrivate.h -AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) -AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) -I$(srcdir)/minizip +MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp) -# 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++ +CLEANFILES = $(MOCEDFILES) +BUILT_SOURCES = $(MOCEDFILES) -liblyxsupport_la_SOURCES = \ +moc_%.cpp: %.h + $(QT_MOC) -o $@ $< + +liblyxsupport_a_DEPENDENCIES = $(MOCEDFILES) + +# +################################################################## + +AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) $(ZLIB_INCLUDES) \ + $(QT_CPPFLAGS) $(QT_INCLUDES) + +liblyxsupport_a_SOURCES = \ FileMonitor.h \ FileMonitor.cpp \ RandomAccessList.h \ - abort.cpp \ - chdir.cpp \ + bind.h \ + ConsoleApplication.cpp \ + ConsoleApplication.h \ + ConsoleApplicationPrivate.h \ convert.cpp \ convert.h \ - copy.cpp \ copied_ptr.h \ - cow_ptr.h \ - debugstream.h \ + debug.cpp \ + debug.h \ docstream.cpp \ 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 \ - Forkedcall.cpp \ - Forkedcall.h \ - ForkedCallQueue.cpp \ - ForkedCallQueue.h \ - ForkedcallsController.cpp \ - ForkedcallsController.h \ - fs_extras.cpp \ - fs_extras.h \ - getcwd.cpp \ + 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 \ lyxalgo.h \ lyxlib.h \ - lyxmanip.h \ lyxtime.cpp \ lyxtime.h \ - lyxsum.cpp \ - mkdir.cpp \ + 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 \ - rename.cpp \ + regex.h \ socktools.cpp \ socktools.h \ - std_istream.h \ - std_ostream.h \ + strfwd.h \ Systemcall.cpp \ Systemcall.h \ - tempname.cpp \ - textutils.cpp \ + SystemcallPrivate.h \ + shared_ptr.h \ + TempFile.cpp \ + TempFile.h \ textutils.h \ Translator.h \ Timeout.cpp \ Timeout.h \ + trivstring.cpp \ + trivstring.h \ types.h \ userinfo.cpp \ userinfo.h \ unicode.cpp \ unicode.h \ - unlink.cpp \ - minizip/crypt.h \ - minizip/ioapi.c \ - minizip/ioapi.h \ - minizip/unzip.c \ - minizip/unzip.h \ - minizip/zip.c \ - minizip/zip.h - -if INSTALL_WINDOWS -liblyxsupport_la_SOURCES += \ - minizip/iowin32.c \ - minizip/iowin32.h + weighted_btree.h +if USE_INCLUDED_MYTHES +liblyxsupport_a_SOURCES += \ + mythes/mythes.cxx \ + mythes/mythes.hxx \ + mythes/license.readme endif -Package.cpp: build_package - -# Solaris sed does not like spaces bewteen the ;-delimited commands -build_package: Package.cpp.in - @rm -f tmp_package ;\ - sed "s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\ -s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\ -s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\ -s,@PROGRAM_SUFFIX@,$(program_suffix)," \ - $(srcdir)/Package.cpp.in > tmp_package ;\ - if cmp -s tmp_package Package.cpp ; then \ - rm -f tmp_package ;\ - else \ - rm -f Package.cpp ;\ - mv tmp_package Package.cpp ;\ - fi - +#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 ################################## -EXTRA_DIST += tests/test_convert tests/test_filetools \ - tests/test_lstrings tests/regfiles +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 = \ - 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 \ - qstring_helpers.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 \ - qstring_helpers.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