From 73fd2cefcaa45a6e21bfa1a97da2aa4d6f37abc5 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Wed, 16 Feb 2011 23:39:45 +0100 Subject: [PATCH] Build system - missing source code files for deprecated autotools - exclude test cmakefile in packaged source --- CMakeLists.txt | 6 ++++-- Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8de283ff8..8b83ff91b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,9 @@ add_subdirectory (src) add_subdirectory (doc) add_subdirectory (i18n) add_subdirectory (scripts) -add_subdirectory (test EXCLUDE_FROM_ALL) +if (EXISTS test) + add_subdirectory (test EXCLUDE_FROM_ALL) +endif (EXISTS test) set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING) foreach (doc_FILE ${doc_FILES}) @@ -90,6 +92,6 @@ set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION}) set (CPACK_SOURCE_IGNORE_FILES "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig" "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$" "test" "package-config" "misc/*" - "src/task$" "src/libtask.a" "auto.h" + "src/task$" "src/libtask.a" "auto.h$" "/\\.gitignore" "/\\.git/" "swp$") include (CPack) diff --git a/Makefile.am b/Makefile.am index 5db63cc92..2de496b60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,4 +20,4 @@ i18ndir = $(docdir) nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE rcfiledir = $(docdir)/rc -dist_rcfile_DATA = doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme doc/rc/holidays-AT.rc doc/rc/holidays-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-DK.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-IT.rc doc/rc/holidays-NL.rc doc/rc/holidays-NO.rc doc/rc/holidays-NZ.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/light-16.theme doc/rc/light-256.theme +dist_rcfile_DATA = doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme doc/rc/holidays-AT.rc doc/rc/holidays-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-DK.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-IT.rc doc/rc/holidays-NL.rc doc/rc/holidays-NO.rc doc/rc/holidays-NZ.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-gray-256.theme diff --git a/src/Makefile.am b/src/Makefile.am index 55f4b1fce..8c3458052 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ task_SOURCES = API.cpp API.h Att.cpp Att.h Cmd.cpp Cmd.h Color.cpp Color.h \ command.cpp custom.cpp dependency.cpp diag.cpp edit.cpp \ export.cpp history.cpp i18n.h import.cpp interactive.cpp \ main.cpp main.h recur.cpp report.cpp rules.cpp rx.cpp rx.h \ - text.cpp text.h util.cpp util.h Uri.cpp Uri.h + text.cpp text.h util.cpp util.h Uri.cpp Uri.h JSON.cpp JSON.h utf8.cpp utf8.h task_CPPFLAGS=$(LUA_CFLAGS) task_LDFLAGS=$(LUA_LFLAGS)