[gnome-system-monitor] Force linking of the UI resources.
- From: Benoît Dejean <bdejean src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Force linking of the UI resources.
- Date: Mon, 20 Feb 2017 08:03:12 +0000 (UTC)
commit 7abb9f3c243c4747145158ea6b9b853be0c46164
Author: Benoît Dejean <bdejean gmail com>
Date: Sun Feb 19 12:29:50 2017 +0100
Force linking of the UI resources.
src/Makefile.am | 2 ++
src/legacy/Makefile.am | 5 ++++-
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5df84c8..3ca5152 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,10 +44,12 @@ gnome_system_monitor_SOURCES = \
$(gnome_system_monitor_cpp_files) \
main.cpp
+# See legacy/Makefile.am for explanation
LDADD = \
$(GSM_LIBS) \
$(SYSTEMD_LIBS) \
$(WNCK_LIBS) \
+ legacy/gsm-resources.o \
legacy/libgsmlegacy.la
diff --git a/src/legacy/Makefile.am b/src/legacy/Makefile.am
index 9f3e68b..8b557d0 100644
--- a/src/legacy/Makefile.am
+++ b/src/legacy/Makefile.am
@@ -5,6 +5,10 @@ AM_CPPFLAGS = \
$(SYSTEMD_CFLAGS) \
$(WNCK_CFLAGS)
+# Build the file here to have the proper CFLAGS but manually link the
+# file from above otherwise (and I don't understand why) the linker is
+# not able to load the objects. even when referencing it, even
+# gsm_get_resource so it's also not getting the ELF section.
BUILT_SOURCES = gsm-resources.c
libgsmlegacy_c_files = \
@@ -25,7 +29,6 @@ gsm-resources.c: $(top_srcdir)/src/gsm.gresource.xml $(shell glib-compile-resour
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(top_srcdir) --generate-source
$(top_srcdir)/src/gsm.gresource.xml
-
CLEANFILES = \
$(BUILT_SOURCES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]