diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2016-02-26 18:08:40 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2016-03-03 23:08:37 +0100 |
| commit | 82e13442b9218215e6e13482a0e8cbe927b1cd8d (patch) | |
| tree | e36018e85dd16ceb0a9159d16a016bc20549e4e7 /src/Makefile.am | |
| parent | ad6924aff15f590e6c08961eff20d8e8cac1eac2 (diff) | |
| download | virt-viewer-82e13442b9218215e6e13482a0e8cbe927b1cd8d.tar.gz virt-viewer-82e13442b9218215e6e13482a0e8cbe927b1cd8d.tar.xz virt-viewer-82e13442b9218215e6e13482a0e8cbe927b1cd8d.zip | |
Use GResource for loading ui files
Let's take advantage of GResource for loading ui files in a better and
cleaner way than virt_viewer_util_load_ui() was doing.
It also brings the benefit, at least for developers, of being able to
test ui changes without having to "make install" virt-viewer.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f42a7bf..4f511b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,7 @@ bin_PROGRAMS = noinst_LTLIBRARIES = libvirt-viewer.la -builderxmldir = $(pkgdatadir)/ui -builderxml_DATA = \ +noinst_DATA = \ virt-viewer.xml \ virt-viewer-about.xml \ virt-viewer-auth.xml \ @@ -17,9 +16,10 @@ builderxml_DATA = \ $(NULL) EXTRA_DIST = \ - $(builderxml_DATA) \ + $(noinst_DATA) \ virt-viewer-enums.c.etemplate \ virt-viewer-enums.h.etemplate \ + virt-viewer.gresource.xml \ $(NULL) ENUMS_FILES = \ @@ -27,15 +27,24 @@ ENUMS_FILES = \ $(NULL) BUILT_SOURCES = \ + virt-viewer-resources.h \ + virt-viewer-resources.c \ virt-viewer-enums.h \ virt-viewer-enums.c \ $(NULL) -$(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES) +virt-viewer-resources.c virt-viewer-resources.h: virt-viewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/virt-viewer.gresource.xml) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name virt_viewer $< + +virt-viewer-enums.c virt-viewer-enums.h: %: %.etemplate $(ENUMS_FILES) $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | \ sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' \ -e 's,#include "$(srcdir)/,#include ",' > $@ +CLEANFILES = \ + $(BUILT_SOURCES) \ + $(NULL) + libvirt_viewer_la_SOURCES = \ $(BUILT_SOURCES) \ virt-viewer-util.h \ @@ -185,8 +194,6 @@ if OS_WIN32 remote_viewer_LDFLAGS += -Wl,--subsystem,windows endif -AM_CPPFLAGS = -DPACKAGE_DATADIR=\""$(pkgdatadir)"\" - VIRT_VIEWER_RES = virt-viewer.rc virt-viewer.manifest ICONDIR = $(top_builddir)/icons MANIFESTDIR = $(srcdir) |