[gnome-games] Remove dead code from the build system



commit f6b3a5c5e0f993bd434777f8221486280d64a6a5
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Jan 1 15:31:31 2012 +1100

    Remove dead code from the build system

 configure.ac              |    7 +------
 gnomine/src/Makefile.am   |    5 -----
 gnotravex/src/Makefile.am |    5 -----
 iagno/src/Makefile.am     |    5 -----
 mahjongg/src/Makefile.am  |    5 -----
 5 files changed, 1 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b3a7de9..c83c7c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,6 @@ need_opengl=no
 need_glx=no
 need_python=no
 need_clutter=no
-require_cairo_1_10=no
 
 for game in $gamelist; do
   case $game in
@@ -327,11 +326,7 @@ have_rsvg=no
 if test "$need_rsvg" = "yes"; then
   have_rsvg=yes
 
-  if test "$require_cairo_1_10" = "yes"; then
-    CAIRO_REQUIRED=1.10.0
-  else
-    CAIRO_REQUIRED=1.0
-  fi
+  CAIRO_REQUIRED=1.10.0
 
   # Errors out if rsvg is not found
   PKG_CHECK_MODULES([RSVG],[
diff --git a/gnomine/src/Makefile.am b/gnomine/src/Makefile.am
index c99155c..c892ea5 100644
--- a/gnomine/src/Makefile.am
+++ b/gnomine/src/Makefile.am
@@ -25,11 +25,6 @@ gnomine_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS)
 
-if HAVE_GNOME
-gnomine_CFLAGS += $(GNOME_CFLAGS)
-gnomine_LDADD += $(GNOME_LIBS)
-endif
-
 if HAVE_RSVG
 gnomine_CFLAGS += $(RSVG_CFLAGS)
 gnomine_LDADD += $(RSVG_LIBS)
diff --git a/gnotravex/src/Makefile.am b/gnotravex/src/Makefile.am
index db3bacd..7670d02 100644
--- a/gnotravex/src/Makefile.am
+++ b/gnotravex/src/Makefile.am
@@ -27,11 +27,6 @@ gnotravex_LDADD =	\
 	$(GTK_LIBS)	\
 	$(INTLLIBS)
 
-if HAVE_GNOME
-gnotravex_CFLAGS += $(GNOME_CFLAGS)
-gnotravex_LDADD += $(GNOME_LIBS)
-endif
-
 if HAVE_RSVG
 gnotravex_CFLAGS += $(RSVG_CFLAGS)
 gnotravex_LDADD += $(RSVG_LIBS)
diff --git a/iagno/src/Makefile.am b/iagno/src/Makefile.am
index 96cd049..7f86ee6 100644
--- a/iagno/src/Makefile.am
+++ b/iagno/src/Makefile.am
@@ -29,11 +29,6 @@ iagno_LDADD = \
 	$(GTK_LIBS) \
 	$(CANBERRA_GTK_LIBS)
 
-if HAVE_GNOME
-iagno_CFLAGS += $(GNOME_CFLAGS)
-iagno_LDADD += $(GNOME_LIBS)
-endif
-
 if HAVE_RSVG
 iagno_CFLAGS += $(RSVG_CFLAGS)
 iagno_LDADD += $(RSVG_LIBS)
diff --git a/mahjongg/src/Makefile.am b/mahjongg/src/Makefile.am
index 05c9485..2f4b1f4 100644
--- a/mahjongg/src/Makefile.am
+++ b/mahjongg/src/Makefile.am
@@ -25,11 +25,6 @@ mahjongg_LDADD = \
 	$(GTK_LIBS)	\
 	$(INTLLIBS)
 
-if HAVE_GNOME
-mahjongg_CFLAGS += $(GNOME_CFLAGS)
-mahjongg_LDADD += $(GNOME_LIBS)
-endif
-
 if HAVE_RSVG
 mahjongg_CFLAGS += $(RSVG_CFLAGS)
 mahjongg_LDADD += $(RSVG_LIBS)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]