GNOME.org
 

gnome-games r7257 - in trunk: . gnect/data gnibbles iagno po

Author: chpe
Date: Sun Jan 20 21:57:00 2008
New Revision: 7257
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7257&view=rev

Log:
2008-01-20  Christian Persch  <chpe gnome org>

	* configure.in:
	* gnect/data/Makefile.am:
	R gnect/data/gnect.room:
	A gnect/data/gnect.room.in:
	* gnibbles/Makefile.am:
	R gnibbles/gnibbles.room:
	A gnibbles/gnibbles.room.in:
	* iagno/Makefile.am:
	R iagno/iagno.room:
	A iagno/iagno.room.in:
	* po/POTFILES.in: Make .room files translatable. Bug #510789.

Added:
   trunk/gnect/data/gnect.room.in
      - copied, changed from r7228, /trunk/gnect/data/gnect.room
   trunk/gnibbles/gnibbles.room.in
      - copied, changed from r7228, /trunk/gnibbles/gnibbles.room
   trunk/iagno/iagno.room.in
      - copied, changed from r7228, /trunk/iagno/iagno.room
Removed:
   trunk/gnect/data/gnect.room
   trunk/gnibbles/gnibbles.room
   trunk/iagno/iagno.room
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gnect/data/Makefile.am
   trunk/gnibbles/Makefile.am
   trunk/iagno/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 20 21:57:00 2008
@@ -547,6 +547,9 @@
 
 IT_PROG_INTLTOOL([0.35.0])
 
+GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE='%.room:   %.room.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST([GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE])
+
 # ********************
 # Game specific checks
 # ********************

Modified: trunk/gnect/data/Makefile.am
==============================================================================
--- trunk/gnect/data/Makefile.am	(original)
+++ trunk/gnect/data/Makefile.am	Sun Jan 20 21:57:00 2008
@@ -17,6 +17,7 @@
 	     $(velena_DATA)      \
              $(schema_in_files)
 
+CLEANFILES = $(ggzroom_DATA)
 DISTCLEANFILES = $(schema_DATA) $(Games_DATA)
 
 install-data-local:
@@ -33,8 +34,10 @@
 
 
 if GGZ_SERVER
-ggzroom_DATA = gnect.room
+ggzroom_in_files = gnect.room.in
+ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
 ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
 
 ggzgame_DATA = gnect-server.dsc
 ggzgamedir = ${prefix}/etc/ggzd/games/

Copied: trunk/gnect/data/gnect.room.in (from r7228, /trunk/gnect/data/gnect.room)
==============================================================================
--- /trunk/gnect/data/gnect.room	(original)
+++ trunk/gnect/data/gnect.room.in	Sun Jan 20 21:57:00 2008
@@ -1,12 +1,12 @@
 [RoomInfo]
 # This is the short name for the room
-Name = Four-in-a-Row 
+_Name=Four-in-a-Row
 # This is the long descriptive name for the room
-Description = Connect four tiles in a row
+_Description=Connect four tiles in a row
 # The gametype should match up to the Name of an added game
-GameType = Gnect
+GameType=Gnect
 # Any additional game arguments specific to this room
-#ExecutableArgs = 
+#ExecutableArgs=
 # These set maximum values for this room
-MaxPlayers = 150
-MaxTables = 45
+MaxPlayers=150
+MaxTables=45

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Sun Jan 20 21:57:00 2008
@@ -1,36 +1,4 @@
-pixmapdir=$(datadir)/pixmaps/gnibbles
-configdir=$(datadir)/gnibbles
-Gamesdir=$(datadir)/applications
-
-INCLUDES =		 			\
-	$(GNOME_GAMES_CFLAGS)			\
-	-I$(top_srcdir)/libgames-support	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DREAL_DATADIR=\""$(datadir)"\" 	\
-	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
-	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
-
-if GGZ_SERVER
-bin_PROGRAMS = gnibbles gnibblesd 
-gnibblesd_SOURCES = server.h   \
-		 server.c   
-
-gnibblesd_LDFLAGS = @GGZDMOD_LDFLAGS@
-
-gnibblesd_LDADD = \
-	$(GNOME_GAMES_LIBS)     \
-	$(INTLLIBS) 		\
-	@LIB_GGZDMOD@
-
-else
-bin_PROGRAMS = gnibbles 
-endif
-
-if GGZ_CLIENT
-GGZ_FILES =	ggz-network.h \
-		ggz-network.c \
-		$(NULL)
-endif
+bin_PROGRAMS = gnibbles
 
 gnibbles_SOURCES = \
 	bonus.h \
@@ -53,19 +21,50 @@
 	scoreboard.c \
 	main.c \
 	main.h \
-	$(GGZ_FILES)
+	$(NULL)
+
+gnibbles_CPPFLAGS = \
+	-I$(top_srcdir)/libgames-support \
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DREAL_DATADIR=\""$(datadir)"\" \
+	$(AM_CPPFLAGS)
+
+gnibbles_CFLAGS = \
+	$(GNOME_GAMES_CFLAGS)			\
+	$(AM_CFLAGS)
+
+gnibbles_LDFLAGS = $(AM_LDFLAGS)
 
 gnibbles_LDADD = \
-	../libgames-support/libgames-support.la \
+	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GNOME_GAMES_LIBS) \
-	$(INTLLIBS) \
+	$(INTLLIBS)
+
+if GGZ_CLIENT
+gnibbles_SOURCES += \
+	ggz-network.h \
+	ggz-network.c \
+	$(NULL)
+
+gnibbles_CPPFLAGS += \
+	$(GGZMOD_INCLUDES) \
+	$(GGZ_GTK_INCLUDES) \
+	$(GGZCORE_INCLUDES) \
+	$(LIBGGZ_INCLUDES) \
+	$(GGZCORE_INCLUDES) \
+	$(GGZDMOD_INCLUDES)
+
+gnibbles_LDADD += \
 	$(LIB_GGZMOD) \
 	$(LIB_GGZ_GTK)
 
-gnibbles_LDFLAGS = $(GGZMOD_LDFLAGS)
+gnibbles_LDFLAGS += $(GGZMOD_LDFLAGS)
+endif
 
+pixmapdir = $(datadir)/pixmaps/gnibbles
 pixmap_DATA = gnibbles-logo.svg
 
+configdir = $(datadir)/gnibbles
 config_DATA = \
 	level001.gnl \
 	level002.gnl \
@@ -92,10 +91,12 @@
 	level023.gnl \
 	level024.gnl \
 	level025.gnl \
-	level026.gnl
+	level026.gnl \
+	$(NULL)
 
-Games_in_files = gnibbles.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
+desktopdir=$(datadir)/applications
+desktop_in_files = gnibbles.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -103,6 +104,43 @@
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+if GGZ_SERVER
+bin_PROGRAMS += gnibblesd
+
+gnibblesd_SOURCES =
+	server.h \
+	server.c \
+	$(NULL)
+
+gnibblesd_CPPFLAGS = \
+	-I$(top_srcdir)/libgames-support \
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DREAL_DATADIR=\""$(datadir)"\" \
+	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
+	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
+	$(AM_CPPFLAGS)
+
+gnibblesd_CFLAGS = \
+	$(GNOME_GAMES_CFLAGS)			\
+	$(AM_CFLAGS)
+
+gnibblesd_LDFLAGS = $(AM_LDFLAGS) $(GGZDMOD_LDFLAGS)
+
+gnibblesd_LDADD = \
+	$(GNOME_GAMES_LIBS)     \
+	$(INTLLIBS) 		\
+	$(LIB_GGZDMOD)
+
+ggzroom_in_files = gnibbles.room.in
+ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
+ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
+
+ggzgame_DATA = gnibbles-server.dsc
+ggzgamedir = ${prefix}/etc/ggzd/games/
+
+endif # GGZ_SERVER
+
 EXTRA_DIST = \
 	$(pixmap_DATA) 	\
 	$(config_DATA) \
@@ -113,6 +151,8 @@
 
 SUBDIRS= help pix
 
+CLEANFILES = $(ggzroom_DATA)
+
 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
 
 SCOREFILES = 4.0 3.0 2.0 1.0 4.1 3.1 2.1 1.1
@@ -136,14 +176,3 @@
 if GGZ_CLIENT
 	-$(GGZ_CONFIG) -D --remove --modfile=gnibbles-client.dsc
 endif
-
-
-if GGZ_SERVER
-ggzroom_DATA = gnibbles.room
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
-
-ggzgame_DATA = gnibbles-server.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
-endif
-
-

Copied: trunk/gnibbles/gnibbles.room.in (from r7228, /trunk/gnibbles/gnibbles.room)
==============================================================================
--- /trunk/gnibbles/gnibbles.room	(original)
+++ trunk/gnibbles/gnibbles.room.in	Sun Jan 20 21:57:00 2008
@@ -1,12 +1,12 @@
 [RoomInfo]
 # This is the short name for the room
-Name = Gnibbles 
+_Name=Gnibbles
 # This is the long descriptive name for the room
-Description = Gnibbles is a worms game for GNOME.
+_Description=Gnibbles is a worms game for GNOME.
 # The gametype should match up to the Name of an added game
-GameType = Gnibbles 
+GameType=Gnibbles
 # Any additional game arguments specific to this room
-#ExecutableArgs = 
+#ExecutableArgs=
 # These set maximum values for this room
-MaxPlayers = 150
-MaxTables = 45
+MaxPlayers=150
+MaxTables=45

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Sun Jan 20 21:57:00 2008
@@ -87,11 +87,15 @@
 
 SUBDIRS= help
 
+CLEANFILES = $(ggzroom_DATA)
 DISTCLEANFILES = $(Games_DATA) $(schema_DATA) 
 
 if GGZ_SERVER
-ggzroom_DATA = iagno.room
+ggzroom_in_files = iagno.room.in
+ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
 ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
+
 
 ggzgame_DATA = iagno-server.dsc
 ggzgamedir = ${prefix}/etc/ggzd/games/

Copied: trunk/iagno/iagno.room.in (from r7228, /trunk/iagno/iagno.room)
==============================================================================
--- /trunk/iagno/iagno.room	(original)
+++ trunk/iagno/iagno.room.in	Sun Jan 20 21:57:00 2008
@@ -1,12 +1,12 @@
 [RoomInfo]
 # This is the short name for the room
-Name = Iagno 
+_Name=Iagno
 # This is the long descriptive name for the room
-Description = The GNOME version of Reversi. The goal is to control the most disks on the board.
+_Description=The GNOME version of Reversi. The goal is to control the most disks on the board.
 # The gametype should match up to the Name of an added game
-GameType = Iagno 
+GameType=Iagno
 # Any additional game arguments specific to this room
-#ExecutableArgs = 
+#ExecutableArgs=
 # These set maximum values for this room
-MaxPlayers = 150
-MaxTables = 45
+MaxPlayers=150
+MaxTables=45

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Jan 20 21:57:00 2008
@@ -188,6 +188,7 @@
 glines/glines.desktop.in.in
 glines/glines.schemas.in
 gnect/data/gnect.desktop.in.in
+[type: gettext/ini]gnect/data/gnect.room.in
 gnect/data/gnect.schemas.in
 gnect/src/connectx_client.c
 gnect/src/gfx.c
@@ -199,6 +200,7 @@
 gnibbles/ggz-network.c
 gnibbles/gnibbles.c
 gnibbles/gnibbles.desktop.in.in
+[type: gettext/ini]gnibbles/gnibbles.room.in
 gnibbles/gnibbles.schemas.in
 gnibbles/main.c
 gnibbles/preferences.c
@@ -266,6 +268,7 @@
 gtali/yahtzee.c
 iagno/gnothello.c
 iagno/iagno.desktop.in.in
+[type: gettext/ini]iagno/iagno.room.in
 iagno/iagno.schemas.in
 iagno/ggz-network.c
 iagno/othello.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]