[gnome-games] Remove NULL variables from Makefiles

[Robert Ancell <rancell src gnome org>]

commit 0efca673443383b7bbbfacdd283e4acbba2617c3
Author: Robert Ancell <robert ancell canonical com>
Date:   Sat Dec 31 18:47:54 2011 +1100

    Remove NULL variables from Makefiles

 Makefile.am                  |   11 +++--------
 gnect/data/Makefile.am       |    4 ----
 gnect/src/Makefile.am        |    3 +--
 gnotski/data/Makefile.am     |    3 +--
 gtali/src/Makefile.am        |    6 ++----
 libgames-support/Makefile.am |   35 +++++++++++------------------------
 sounds/Makefile.am           |    5 +----
 7 files changed, 19 insertions(+), 48 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c059ff1..b50f9c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-NULL =
-
 SUBDIRS = libgames-support $(gamelist) po
 
 if ENABLE_SOUND
@@ -23,15 +21,13 @@ EXTRA_DIST = \
 	MAINTAINERS	\
 	HACKING		 \
 	gnome-doc-utils.make \
-	ChangeLog \
-	$(NULL)
+	ChangeLog
 
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update \
-	gnome-doc-utils.make \
-	$(NULL)
+	gnome-doc-utils.make
 
 MAINTAINERCLEANFILES = \
 	ChangeLog \
@@ -52,8 +48,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/mkinstalldirs \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/po/Makefile.in.in \
-	`find "$(srcdir)" -type f -name Makefile.in -print` \
-	$(NULL)
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 # Ignore score files, these *should* be left behind.
 distuninstallcheck_listfiles = find . -type f -print | grep -v '.scores' | grep-v scrollkeeper
diff --git a/gnect/data/Makefile.am b/gnect/data/Makefile.am
index 4174615..e03af43 100644
--- a/gnect/data/Makefile.am
+++ b/gnect/data/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = icons
 
-NULL =
-
 pixmapdir = $(pkgdatadir)/gnect/pixmaps
 pixmap_DATA = \
     tileset_50x50_sunspot.svg \
@@ -34,8 +32,6 @@ EXTRA_DIST = $(pixmap_DATA) \
              $(schema_in_files) \
              $(man_MANS)
 
-CLEANFILES = $(NULL)
-
 DISTCLEANFILES = $(schema_DATA) $(Games_DATA)
 
 install-data-local: 
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index 2281563..92a16fc 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -35,8 +35,7 @@ gnect_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
 	$(INTLLIBS) \
-	-lz \
-	$(NULL)
+	-lz
 
 if HAVE_GNOME
 gnect_CFLAGS += $(GNOME_CFLAGS)
diff --git a/gnotski/data/Makefile.am b/gnotski/data/Makefile.am
index 9a396ff..524b1dc 100644
--- a/gnotski/data/Makefile.am
+++ b/gnotski/data/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = icons
 
 pixmapdir = $(pkgdatadir)/gnotski/pixmaps
 pixmap_DATA = \
-	gnotski.svg	\
-	$(NULL)
+	gnotski.svg
 
 schema_in_files = gnotski.schemas.in
 if HAVE_GNOME
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
index 441cf32..1cb53b1 100644
--- a/gtali/src/Makefile.am
+++ b/gtali/src/Makefile.am
@@ -7,8 +7,7 @@ gtali_SOURCES =       \
 	yahtzee.h        \
 	yahtzee.c        \
 	computer.c       \
-	setup.c          \
-	$(NULL)
+	setup.c
 
 gtali_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -21,8 +20,7 @@ gtali_CFLAGS = \
 gtali_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS)	\
-	$(INTLLIBS)	\
-	$(NULL)
+	$(INTLLIBS)
 
 if HAVE_GNOME
 gtali_CFLAGS += $(GNOME_CFLAGS)
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index ed2b224..81fad4f 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 commondatadir = $(datadir)/gnome-games-common
 
 noinst_LTLIBRARIES = libgames-support.la
@@ -10,8 +8,7 @@ pkglib_LTLIBRARIES =
 
 BUILT_SOURCES = \
 	games-marshal.c			\
-	games-marshal.h			\
-	$(NULL)
+	games-marshal.h
 
 libgames_support_la_SOURCES =		\
 	games-conf.c			\
@@ -31,8 +28,7 @@ libgames_support_la_SOURCES =		\
 	games-stock.c			\
 	games-stock.h			\
 	games-string-utils.c		\
-	games-string-utils.h		\
-	$(NULL)
+	games-string-utils.h
 
 nodist_libgames_support_la_SOURCES = $(BUILT_SOURCES)
 
@@ -43,14 +39,12 @@ libgames_support_la_SOURCES +=		\
 	games-clock.h			\
 	games-preimage.c                \
 	games-preimage.h                \
-	games-preimage-private.h	\
-	$(NULL)
+	games-preimage-private.h
 
 if HAVE_GIO_2_26
 libgames_support_la_SOURCES += \
 	games-settings.c \
-	games-settings.h \
-	$(NULL)
+	games-settings.h
 endif
 
 libgames_support_la_SOURCES +=		\
@@ -73,14 +67,12 @@ libgames_support_la_SOURCES +=		\
 	games-controls.c		\
 	games-controls.h		\
 	games-scores-backend.c		\
-	games-scores-backend.h		\
-	$(NULL)
+	games-scores-backend.h
 
 if ENABLE_SETGID
 libgames_support_la_SOURCES +=		\
 	games-setgid-io.c		\
-	games-setgid-io.h		\
-	$(NULL)
+	games-setgid-io.h
 endif # ENABLE_SETGID
 
 libgames_support_la_CPPFLAGS = \
@@ -109,8 +101,7 @@ if WITH_SMCLIENT
 libgames_support_la_SOURCES += \
 	eggsmclient.c \
 	eggsmclient.h \
-	eggsmclient-private.h \
-	$(NULL)
+	eggsmclient-private.h
 libgames_support_la_CFLAGS += $(SMCLIENT_CFLAGS)
 libgames_support_la_LIBADD += $(SMCLIENT_LIBS)
 
@@ -118,8 +109,7 @@ if WITH_SMCLIENT_XSMP
 libgames_support_la_SOURCES += \
 	eggdesktopfile.c \
 	eggdesktopfile.h \
-	eggsmclient-xsmp.c \
-	$(NULL)
+	eggsmclient-xsmp.c
 libgames_support_la_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
 endif
 if WITH_SMCLIENT_WIN32
@@ -150,19 +140,16 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.gschema.xml.in=.gschema.xml)
 
 stamp_files = \
 	stamp-games-marshal.c \
-	stamp-games-marshal.h \
-	$(NULL)
+	stamp-games-marshal.h
 
 EXTRA_DIST = \
 	games-marshal.list \
-	$(gsettingsschema_in_files) \
-	$(NULL)
+	$(gsettingsschema_in_files)
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(stamp_files) \
-	$(gsettings_SCHEMAS) \
-	$(NULL)
+	$(gsettings_SCHEMAS)
 
 DISTCLEANFILES =
 
diff --git a/sounds/Makefile.am b/sounds/Makefile.am
index 2701479..ca51827 100644
--- a/sounds/Makefile.am
+++ b/sounds/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
 sounddir = $(pkgdatadir)/sounds
 
 sound_DATA = \
@@ -26,8 +24,7 @@ sound_DATA = \
 	teleport.ogg \
 	turn.ogg \
 	victory.ogg \
-	yahoo.ogg \
-	$(NULL)
+	yahoo.ogg
 
 EXTRA_DIST = $(sound_DATA)