gnome-games r8179 - in trunk: . aisleriot

[chpe svn gnome org]

Author: chpe
Date: Tue Oct 21 21:50:22 2008
New Revision: 8179
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8179&view=rev

Log:
In the HAVE_CLUTTER case, build a noinst sol-noclutter aisleriot
variant, to ensure it always builds and to test against.

Modified:
   trunk/aisleriot/Makefile.am
   trunk/configure.in

Modified: trunk/aisleriot/Makefile.am
==============================================================================
--- trunk/aisleriot/Makefile.am	(original)
+++ trunk/aisleriot/Makefile.am	Tue Oct 21 21:50:22 2008
@@ -101,10 +101,35 @@
 endif
 
 if HAVE_CLUTTER
+sol_CPPFLAGS += -DHAVE_CLUTTER
 sol_CFLAGS += $(CLUTTER_CFLAGS)
 sol_LDADD += $(CLUTTER_LIBS)
 endif
 
+if HAVE_CLUTTER
+noinst_PROGRAMS = sol-noclutter
+
+sol_noclutter_SOURCES = \
+	board.h			\
+	board-noclutter.c	\
+	conf.c			\
+	conf.h			\
+	game.c			\
+	game.h			\
+	sol.c			\
+	stats-dialog.c		\
+	stats-dialog.h		\
+	util.c			\
+	util.h			\
+	window.c		\
+	window.h		\
+	$(NULL)
+
+sol_noclutter_CPPFLAGS = $(sol_CPPFLAGS) -UHAVE_CLUTTER
+sol_noclutter_CFLAGS = $(sol_CFLAGS)
+sol_noclutter_LDADD = $(sol_LDADD)
+endif
+
 desktop_in_files = \
 	sol.desktop.in.in
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 21 21:50:22 2008
@@ -478,8 +478,6 @@
      clutter-cairo-$CLUTTER_API_VERSION >= $CLUTTER_CAIRO_REQUIRED])
   AC_SUBST([CLUTTER_CFLAGS])
   AC_SUBST([CLUTTER_LIBS])
-
-  AC_DEFINE([HAVE_CLUTTER],[1],[Define if clutter is available])
 fi
 
 AM_CONDITIONAL([HAVE_CLUTTER],[test "$enable_clutter" = "yes"])