[gsettings-desktop-schemas] build: Update all Makefile.am to more recent standards
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gsettings-desktop-schemas] build: Update all Makefile.am to more recent standards
- Date: Mon, 20 Sep 2010 15:44:26 +0000 (UTC)
commit e5da015fa3e4433b2ebb07050899367171a11286
Author: Vincent Untz <vuntz gnome org>
Date: Mon Sep 20 17:41:11 2010 +0200
build: Update all Makefile.am to more recent standards
Makefile.am | 5 +----
schemas/Makefile.am | 17 +++++------------
2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 90edc81..0eb6996 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
SUBDIRS = headers schemas po
ACLOCAL_AMFLAGS = -I m4
@@ -9,8 +7,7 @@ pkgconfig_DATA = gsettings-desktop-schemas.pc
EXTRA_DIST = \
HACKING \
- MAINTAINERS \
- $(NULL)
+ MAINTAINERS
MAINTAINERCLEANFILES = \
$(srcdir)/m4/* \
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 97badc9..76a162b 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,16 +1,12 @@
-NULL =
-
desktop_gschemas = \
org.gnome.desktop.default-applications.gschema.xml \
org.gnome.desktop.interface.gschema.xml \
org.gnome.desktop.lockdown.gschema.xml \
org.gnome.desktop.url-handlers.gschema.xml \
- org.gnome.system.proxy.gschema.xml \
- $(NULL)
+ org.gnome.system.proxy.gschema.xml
desktop_gschemas_in = \
- org.gnome.desktop.background.gschema.xml.in \
- $(NULL)
+ org.gnome.desktop.background.gschema.xml.in
desktop_gschemas_in_processed = $(desktop_gschemas_in:.gschema.xml.in=.gschema.xml)
@@ -19,8 +15,7 @@ gsettings_ENUM_FILES = $(top_srcdir)/headers/*.h
gsettings_SCHEMAS = \
$(desktop_gschemas) \
- $(desktop_gschemas_in_processed) \
- $(NULL)
+ $(desktop_gschemas_in_processed)
%.gschema.xml: %.gschema.xml.in Makefile
$(AM_V_GEN) $(SED) -e 's^\ datadir\@^$(datadir)^g' < $< > $@
@@ -29,13 +24,11 @@ gsettings_SCHEMAS = \
EXTRA_DIST = \
$(desktop_gschemas) \
- $(desktop_gschemas_in) \
- $(NULL)
+ $(desktop_gschemas_in)
CLEANFILES = \
$(gsettings__enum_file) \
$(desktop_gschemas_in_processed) \
- *.gschema.valid \
- $(NULL)
+ *.gschema.valid
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]