[nautilus] build: cleanup GResource dependency generation
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] build: cleanup GResource dependency generation
- Date: Mon, 14 Jan 2013 23:30:50 +0000 (UTC)
commit 638f32e0694d1c6eff89ddce2b3c0a3f5c77d356
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Jan 14 18:25:15 2013 -0500
build: cleanup GResource dependency generation
- make sure to use --sourcedir=$(srcdir)
- use the generated dependency list to add files to EXTRA_DIST instead
of doing it manually
Makefile.am | 1 -
configure.ac | 1 -
icons/Makefile.am | 10 ----------
src/Makefile.am | 19 ++++---------------
4 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 58ba200..5aa658d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ DIRS = \
test \
po \
data \
- icons \
docs \
$(NULL)
diff --git a/configure.ac b/configure.ac
index e239cce..c6ece2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,6 @@ docs/reference/Makefile
docs/reference/libnautilus-extension/Makefile
docs/reference/libnautilus-extension/version.xml
eel/Makefile
-icons/Makefile
libnautilus-private/Makefile
libnautilus-extension/Makefile
libnautilus-extension/libnautilus-extension.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 53dde97..cb7a572 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,25 +68,14 @@ $(dbus_shell_search_provider_built_sources) : Makefile.am $(top_srcdir)/data/she
$(top_srcdir)/data/shell-search-provider-dbus-interfaces.xml \
$(NULL)
-UI_FILES = \
- nautilus-app-menu.ui \
- nautilus-bookmarks-window.ui \
- nautilus-file-management-properties.ui \
- nautilus-canvas-view-ui.xml \
- nautilus-desktop-canvas-view-ui.xml \
- nautilus-directory-view-ui.xml \
- nautilus-list-view-ui.xml \
- nautilus-shell-ui.xml \
- $(NULL)
-
headers = \
nautilus-special-location-bar.h \
$(NULL)
-nautilus-resources.c: nautilus.gresource.xml $(shell glib-compile-resources --generate-dependencies $(srcdir)/nautilus.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/nautilus.gresource.xml)
+nautilus-resources.c: nautilus.gresource.xml $(resource_files)
glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name nautilus $(srcdir)/nautilus.gresource.xml
-
-nautilus-resources.h: nautilus.gresource.xml
+nautilus-resources.h: nautilus.gresource.xml $(resource_files)
glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name nautilus $(srcdir)/nautilus.gresource.xml
nautilus-enum-types.h: stamp-nautilus-enum-types.h
@@ -263,8 +252,8 @@ CLEANFILES = \
$(NULL)
EXTRA_DIST = \
+ $(resource_files) \
$(server_in_files) \
- $(UI_FILES) \
nautilus.gresource.xml \
check-nautilus \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]