[glom] Explicitly link in the GResource .c files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Explicitly link in the GResource .c files.
- Date: Tue, 22 Oct 2013 13:00:05 +0000 (UTC)
commit b695e7ddf90baf1dfdb8cc2d78eca43aaf465e47
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Oct 22 14:58:55 2013 +0200
Explicitly link in the GResource .c files.
I do not know how these get built and linked in without this.
Makefile.am | 2 --
Makefile_glom.am | 6 ++++--
Makefile_libglom.am | 3 +++
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1a74019..cd71408 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,8 +157,6 @@ EXTRA_DIST += \
data/ui/developer/window_translations.glade \
data/ui/developer/window_users.glade
-EXTRA_DIST += data/xslt/print_report_to_html.xsl
-
# Get the base filenames only, without the extension:
example_files_names ?= $(patsubst %.glom,%,$(notdir $(example_files)))
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 2e3dcd5..84f65ee 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -41,7 +41,7 @@ BUILT_SOURCES += examples/glom-examples-resources.c
examples/glom-examples-resources.c: $(glom_examples_resource_file) $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(glom_examples_resource_file))
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source
$(glom_examples_resource_file)
-EXTRA_DIST = \
+EXTRA_DIST += \
$(glom_resource_file) \
$(glom_examples_resource_file)
@@ -272,7 +272,9 @@ glom_source_files = \
glom/utility_widgets/adddel/treeviewcolumn_glom.h \
$(glom_canvas_files) \
glom/utility_widgets/cellrendererlist.cc \
- glom/utility_widgets/cellrendererlist.h
+ glom/utility_widgets/cellrendererlist.h \
+ examples/glom-examples-resources.c \
+ data/glom-resources.c
if !GLOM_ENABLE_CLIENT_ONLY
glom_source_files += \
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index ea00ea7..72aefd2 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -70,6 +70,9 @@ BUILT_SOURCES = glom/libglom/data/libglom-resources.c
glom/libglom/data/libglom-resources.c: $(libglom_resource_file) $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(libglom_resource_file))
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source
$(libglom_resource_file)
+EXTRA_DIST = \
+ $(libglom_resource_file) \
+ glom/libglom/data/xslt/print_report_to_html.xsl
if HOST_WIN32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]