GNOME.org
 

[gnome-games] quadrapassel: additional build fixes

commit e94953c0bd05cb9f4508b49cb2b63b47b9c8c9f6
Author: Jason D. Clinton <me jasonclinton com>
Date:   Mon Oct 26 16:57:10 2009 -0500

    quadrapassel: additional build fixes

 configure.in                                       |   18 ++++----
 quadrapassel/Makefile.am                           |   42 ++++++++++----------
 .../help/C/{gnometris.xml => quadrapassel.xml}     |    0
 .../help/{gnometris.omf.in => quadrapassel.omf.in} |    0
 quadrapassel/{gnometris.6 => quadrapassel.6}       |    0
 ...is.desktop.in.in => quadrapassel.desktop.in.in} |    0
 ...nometris.schemas.in => quadrapassel.schemas.in} |    0
 quadrapassel/{gnometris.svg => quadrapassel.svg}   |    0
 8 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/configure.in b/configure.in
index 76b69d2..a0499b2 100644
--- a/configure.in
+++ b/configure.in
@@ -124,7 +124,7 @@ build_libgamescards=no
 
 for game in $gamelist; do
   case $game in
-    quadrapassle) need_cxx=yes ;;
+    quadrapassel) need_cxx=yes ;;
     *) ;;
   esac
   case $game in
@@ -140,7 +140,7 @@ for game in $gamelist; do
     *) ;;
   esac
   case $game in
-    aisleriot|gnect|gnibbles|gnobots2|quadrapassle|iagno) want_sound=yes ;;
+    aisleriot|gnect|gnibbles|gnobots2|quadrapassel|iagno) want_sound=yes ;;
     *) ;;
   esac
   case $game in
@@ -156,7 +156,7 @@ for game in $gamelist; do
     *) ;;
   esac
   case $game in
-    quadrapassle|lightsoff|swell-foop|gnibbles) need_clutter=yes ;;
+    quadrapassel|lightsoff|swell-foop|gnibbles) need_clutter=yes ;;
     *) ;;
   esac
   case $game in
@@ -192,7 +192,7 @@ AM_CONDITIONAL([BUILD_GNECT],[test "$build_gnect" = "yes"])
 AM_CONDITIONAL([BUILD_GNIBBLES],[test "$build_gnibbles" = "yes"])
 AM_CONDITIONAL([BUILD_GNOBOTS2],[test "$build_gnobots2" = "yes"])
 AM_CONDITIONAL([BUILD_GNOME_SUDOKU],[test "$build_gnome_sudoku" = "yes"])
-AM_CONDITIONAL([BUILD_GNOMETRIS],[test "$build_quadrapassle" = "yes"])
+AM_CONDITIONAL([BUILD_QUADRAPASSEL],[test "$build_quadrapassel" = "yes"])
 AM_CONDITIONAL([BUILD_GNOMINE],[test "$build_gnomine" = "yes"])
 AM_CONDITIONAL([BUILD_GNOTRAVEX],[test "$build_gnotravex" = "yes"])
 AM_CONDITIONAL([BUILD_GNOTSKI],[test "$build_gnotski" = "yes"])
@@ -200,7 +200,7 @@ AM_CONDITIONAL([BUILD_GTALI],[test "$build_gtali" = "yes"])
 AM_CONDITIONAL([BUILD_IAGNO],[test "$build_iagno" = "yes"])
 AM_CONDITIONAL([BUILD_LIGHTSOFF],[test "$build_lightsoff" = "yes"])
 AM_CONDITIONAL([BUILD_MAHJONGG],[test "$build_mahjongg" = "yes"])
-AM_CONDITIONAL([BUILD_SAME_GNOME],[test "$build_same_gnome" = "yes"])
+AM_CONDITIONAL([BUILD_SWELL_FOOP],[test "$build_swell_foop" = "yes"])
 
 # Locate various programs
 
@@ -1120,9 +1120,9 @@ gnotski/help/Makefile
 glines/Makefile
 glines/glines.desktop.in
 glines/help/Makefile
-quadrapassle/Makefile
-quadrapassle/pix/Makefile
-quadrapassle/help/Makefile
+quadrapassel/Makefile
+quadrapassel/pix/Makefile
+quadrapassel/help/Makefile
 gnobots2/Makefile
 gnobots2/help/Makefile
 gnibbles/Makefile
@@ -1165,7 +1165,7 @@ swell-foop/data/themes/test/Makefile
 swell-foop/swell-foop
 swell-foop/swell-foop.desktop.in
 swell-foop/src/Path.js
-quadrapassle/quadrapassle.desktop.in
+quadrapassel/quadrapassel.desktop.in
 gnobots2/gnobots2.desktop.in
 gnibbles/gnibbles.desktop.in
 gnotski/gnotski.desktop.in
diff --git a/quadrapassel/Makefile.am b/quadrapassel/Makefile.am
index 9ab84fb..dedd075 100644
--- a/quadrapassel/Makefile.am
+++ b/quadrapassel/Makefile.am
@@ -4,9 +4,9 @@ if BUILD_HELP
 SUBDIRS += help
 endif
 
-bin_PROGRAMS=gnometris
+bin_PROGRAMS=quadrapassel
 
-gnometris_SOURCES = \
+quadrapassel_SOURCES = \
 	main.cpp \
 	blocks.cpp \
 	blocks.h \
@@ -25,17 +25,17 @@ gnometris_SOURCES = \
 	blocks-cache.cpp \
 	blocks-cache.h
 
-gnometris_CPPFLAGS = \
+quadrapassel_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
 
-gnometris_CXXFLAGS = \
+quadrapassel_CXXFLAGS = \
 	$(GTK_CFLAGS) \
 	$(CLUTTER_CFLAGS) \
 	$(CLUTTER_GTK_CFLAGS) \
 	$(AM_CXXFLAGS)
 
-gnometris_LDADD = \
+quadrapassel_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(CLUTTER_LIBS) \
 	$(CLUTTER_GTK_LIBS) \
@@ -43,36 +43,36 @@ gnometris_LDADD = \
 	$(INTLLIBS)
 
 if HAVE_GNOME
-gnometris_CXXFLAGS += $(GNOME_CFLAGS)
-gnometris_LDADD += $(GNOME_LIBS)
+quadrapassel_CXXFLAGS += $(GNOME_CFLAGS)
+quadrapassel_LDADD += $(GNOME_LIBS)
 endif
 
 if HAVE_RSVG
-gnometris_CXXFLAGS += $(RSVG_CFLAGS) 
-gnometris_LDADD += $(RSVG_LIBS)
+quadrapassel_CXXFLAGS += $(RSVG_CFLAGS) 
+quadrapassel_LDADD += $(RSVG_LIBS)
 endif
 
 if WITH_GTHREAD
-gnometris_CXXFLAGS += $(GHTREAD_CFLAGS)
-gnometris_LDADD += $(GTHREAD_LIBS)
+quadrapassel_CXXFLAGS += $(GHTREAD_CFLAGS)
+quadrapassel_LDADD += $(GTHREAD_LIBS)
 endif
 
-pixmapdir = $(pkgdatadir)/gnometris/pixmaps
-pixmap_DATA = gnometris.svg
+pixmapdir = $(pkgdatadir)/quadrapassel/pixmaps
+pixmap_DATA = quadrapassel.svg
 
 Gamesdir = $(datadir)/applications
-Games_in_files = gnometris.desktop.in.in
+Games_in_files = quadrapassel.desktop.in.in
 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schema_in_files = gnometris.schemas.in
+schema_in_files = quadrapassel.schemas.in
 if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 endif
 @INTLTOOL_SCHEMAS_RULE@
 
-man_MANS = gnometris.6
+man_MANS = quadrapassel.6
 
 EXTRA_DIST = AUTHORS \
 	$(pixmap_DATA) \
@@ -81,16 +81,16 @@ EXTRA_DIST = AUTHORS \
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnometris/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/quadrapassel/$(schema_DATA)
 endif
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-	-touch $(DESTDIR)$(scoredir)/gnometris.scores
-	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnometris.scores
-	-chmod 664 $(DESTDIR)$(scoredir)/gnometris.scores
+	-touch $(DESTDIR)$(scoredir)/quadrapassel.scores
+	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/quadrapassel.scores
+	-chmod 664 $(DESTDIR)$(scoredir)/quadrapassel.scores
 
 install-exec-hook:
 	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnometris && chmod 2555 $(DESTDIR)$(bindir)/gnometris ;\
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/quadrapassel && chmod 2555 $(DESTDIR)$(bindir)/quadrapassel ;\
 	fi
 
 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
diff --git a/quadrapassel/help/C/gnometris.xml b/quadrapassel/help/C/quadrapassel.xml
similarity index 100%
rename from quadrapassel/help/C/gnometris.xml
rename to quadrapassel/help/C/quadrapassel.xml
diff --git a/quadrapassel/help/gnometris.omf.in b/quadrapassel/help/quadrapassel.omf.in
similarity index 100%
rename from quadrapassel/help/gnometris.omf.in
rename to quadrapassel/help/quadrapassel.omf.in
diff --git a/quadrapassel/gnometris.6 b/quadrapassel/quadrapassel.6
similarity index 100%
rename from quadrapassel/gnometris.6
rename to quadrapassel/quadrapassel.6
diff --git a/quadrapassel/gnometris.desktop.in.in b/quadrapassel/quadrapassel.desktop.in.in
similarity index 100%
rename from quadrapassel/gnometris.desktop.in.in
rename to quadrapassel/quadrapassel.desktop.in.in
diff --git a/quadrapassel/gnometris.schemas.in b/quadrapassel/quadrapassel.schemas.in
similarity index 100%
rename from quadrapassel/gnometris.schemas.in
rename to quadrapassel/quadrapassel.schemas.in
diff --git a/quadrapassel/gnometris.svg b/quadrapassel/quadrapassel.svg
similarity index 100%
rename from quadrapassel/gnometris.svg
rename to quadrapassel/quadrapassel.svg
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]