[glom] Fix the make check build.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Fix the make check build.
- Date: Mon, 18 Apr 2011 10:22:46 +0000 (UTC)
commit cdb40426b74417621ca643da269f6e11553af60a
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Apr 18 12:22:39 2011 +0200
Fix the make check build.
* Makefile_glom.am: Create a variable for the eggspreadtable file list.
* Makefile_tests.am: Use that variable here, so we link against the new
files.
ChangeLog | 8 ++++++++
Makefile_glom.am | 31 +++++++++++++++++--------------
Makefile_tests.am | 6 +-----
3 files changed, 26 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 23fdb77..d60d4c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2011-04-18 Murray Cumming <murrayc murrayc com>
+ Fix the make check build.
+
+ * Makefile_glom.am: Create a variable for the eggspreadtable file list.
+ * Makefile_tests.am: Use that variable here, so we link against the new
+ files.
+
+2011-04-18 Murray Cumming <murrayc murrayc com>
+
EggSpreadTableDnd: Wrap the wiget_drop_possible signal.
* glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.[h|cc]:
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 47b23c0..aa48114 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -28,6 +28,22 @@ bin_PROGRAMS = glom/glom
glom_glom_CPPFLAGS = $(glom_includes) $(GLOM_CFLAGS) $(PYTHON_CPPFLAGS) $(BOOST_PYTHON_CFLAGS) $(glom_defines)
+glom_eggspreadtable_files = \
+ glom/utility_widgets/eggspreadtable/eggmarshalers.c \
+ glom/utility_widgets/eggspreadtable/eggmarshalers.h \
+ glom/utility_widgets/eggspreadtable/eggspreadtable.c \
+ glom/utility_widgets/eggspreadtable/eggspreadtable.h \
+ glom/utility_widgets/eggspreadtable/eggspreadtablednd.c \
+ glom/utility_widgets/eggspreadtable/eggspreadtablednd.h \
+ glom/utility_widgets/eggspreadtable/eggplaceholder.c \
+ glom/utility_widgets/eggspreadtable/eggplaceholder.h \
+ glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc \
+ glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.h \
+ glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc \
+ glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h \
+ glom/utility_widgets/eggspreadtablemm/private/eggspreadtablemm_p.h \
+ glom/utility_widgets/eggspreadtablemm/private/eggspreadtabledndmm_p.h
+
glom_source_files = \
glom/application.cc \
glom/application.h \
@@ -178,20 +194,7 @@ glom_source_files = \
glom/utility_widgets/dialog_properties.h \
glom/utility_widgets/flowtable.cc \
glom/utility_widgets/flowtable.h \
- glom/utility_widgets/eggspreadtable/eggmarshalers.c \
- glom/utility_widgets/eggspreadtable/eggmarshalers.h \
- glom/utility_widgets/eggspreadtable/eggspreadtable.c \
- glom/utility_widgets/eggspreadtable/eggspreadtable.h \
- glom/utility_widgets/eggspreadtable/eggspreadtablednd.c \
- glom/utility_widgets/eggspreadtable/eggspreadtablednd.h \
- glom/utility_widgets/eggspreadtable/eggplaceholder.c \
- glom/utility_widgets/eggspreadtable/eggplaceholder.h \
- glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc \
- glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.h \
- glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.cc \
- glom/utility_widgets/eggspreadtablemm/eggspreadtabledndmm.h \
- glom/utility_widgets/eggspreadtablemm/private/eggspreadtablemm_p.h \
- glom/utility_widgets/eggspreadtablemm/private/eggspreadtabledndmm_p.h \
+ $(glom_eggspreadtable_files) \
glom/utility_widgets/gimpruler/gimpruler.c \
glom/utility_widgets/gimpruler/gimpruler.h \
glom/utility_widgets/gimpruler/libgimpbase/gimpbase.h \
diff --git a/Makefile_tests.am b/Makefile_tests.am
index 927e682..d9b6acc 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -157,11 +157,7 @@ TESTS += \
glom_utility_widgets_test_flowtable_SOURCES = \
glom/utility_widgets/flowtable.cc \
glom/utility_widgets/flowtable.h \
- glom/utility_widgets/eggspreadtable/eggspreadtable.c \
- glom/utility_widgets/eggspreadtable/eggspreadtable.h \
- glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.cc \
- glom/utility_widgets/eggspreadtablemm/eggspreadtablemm.h \
- glom/utility_widgets/eggspreadtablemm/private/eggspreadtablemm_p.h \
+ $(glom_eggspreadtable_files) \
glom/utility_widgets/test_flowtable.cc
glom_utility_widgets_test_flowtable_LDADD = $(GLOM_LIBS)
glom_utility_widgets_test_flowtable_CPPFLAGS = $(tests_cppflags_ui)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]