gcompris r3342 - in branches/gcomprixogoo: . src/babymatch-activity src/bargame-activity src/electric-activity src/geo_country-activity src/geography-activity src/gnumch-multiples-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Mar 23 16:23:59 2008
New Revision: 3342
URL: http://svn.gnome.org/viewvc/gcompris?rev=3342&view=rev

Log:
removed double entry of CLEAN in some makefiles
commented out gnet in the configure as it doesn't work anymore


Modified:
   branches/gcomprixogoo/configure.in
   branches/gcomprixogoo/src/babymatch-activity/Makefile.am
   branches/gcomprixogoo/src/bargame-activity/Makefile.am
   branches/gcomprixogoo/src/electric-activity/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/Makefile.am
   branches/gcomprixogoo/src/geography-activity/Makefile.am
   branches/gcomprixogoo/src/gnumch-multiples-activity/Makefile.am

Modified: branches/gcomprixogoo/configure.in
==============================================================================
--- branches/gcomprixogoo/configure.in	(original)
+++ branches/gcomprixogoo/configure.in	Sun Mar 23 16:23:59 2008
@@ -390,19 +390,19 @@
           with_sqlite="$enableval", with_sqlite="yes")
 AC_MSG_RESULT($with_sqlite)
 
-dnl GNET support
-AC_MSG_CHECKING([wether we build with GNET (if not, networking will be disabled)])
-AC_ARG_ENABLE(gnet,
-          AC_HELP_STRING(
-          [--enable-gnet],
-          [Turn on gnet (will let GCompris fetch content from a web server)]),
-          with_gnet="$enableval", with_gnet="no")
-AC_MSG_RESULT($with_gnet)
-
-if test x$with_gnet = xyes; then
-  PKG_CHECK_MODULES(GNET, gnet-2.0,, AC_MSG_ERROR([*** GNET not found!]))
-  AC_DEFINE([USE_GNET], 1,[Networking is enabled])
-fi
+dnl GNET support (BROKEN)
+dnl AC_MSG_CHECKING([wether we build with GNET (if not, networking will be disabled)])
+dnl AC_ARG_ENABLE(gnet,
+dnl           AC_HELP_STRING(
+dnl           [--enable-gnet],
+dnl           [Turn on gnet (will let GCompris fetch content from a web server)]),
+dnl           with_gnet="$enableval", with_gnet="no")
+dnl AC_MSG_RESULT($with_gnet)
+
+dnl if test x$with_gnet = xyes; then
+dnl   PKG_CHECK_MODULES(GNET, gnet-2.0,, AC_MSG_ERROR([*** GNET not found!]))
+dnl   AC_DEFINE([USE_GNET], 1,[Networking is enabled])
+dnl fi
 
 dnl DBUS support
 AC_MSG_CHECKING([wether we build with DBUS (needed only for OLPC SUGAR XO)])

Modified: branches/gcomprixogoo/src/babymatch-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/babymatch-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/babymatch-activity/Makefile.am	Sun Mar 23 16:23:59 2008
@@ -46,8 +46,6 @@
 # in the xml files directly, this is needed for the tool gcompris2spip
 # INTLTOOL_XML_RULE@
 
-CLEANFILES = $(xml_DATA)
-
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = babymatch.svg
 

Modified: branches/gcomprixogoo/src/bargame-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/bargame-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/bargame-activity/Makefile.am	Sun Mar 23 16:23:59 2008
@@ -25,8 +25,6 @@
 # in the xml files directly, this is needed for the tool gcompris2spip
 # INTLTOOL_XML_RULE@
 
-CLEANFILES = $(xml_DATA)
-
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = bargame.svg
 

Modified: branches/gcomprixogoo/src/electric-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/electric-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/electric-activity/Makefile.am	Sun Mar 23 16:23:59 2008
@@ -25,8 +25,6 @@
 # in the xml files directly, this is needed for the tool gcompris2spip
 # INTLTOOL_XML_RULE@
 
-CLEANFILES = $(xml_DATA)
-
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = electric.svg
 

Modified: branches/gcomprixogoo/src/geo_country-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/Makefile.am	Sun Mar 23 16:23:59 2008
@@ -19,8 +19,6 @@
 # in the xml files directly, this is needed for the tool gcompris2spip
 # INTLTOOL_XML_RULE@
 
-CLEANFILES = $(xml_DATA)
-
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = france_region.svg
 

Modified: branches/gcomprixogoo/src/geography-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geography-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geography-activity/Makefile.am	Sun Mar 23 16:23:59 2008
@@ -19,8 +19,6 @@
 # in the xml files directly, this is needed for the tool gcompris2spip
 # INTLTOOL_XML_RULE@
 
-CLEANFILES = $(xml_DATA)
-
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = globe.svg
 

Modified: branches/gcomprixogoo/src/gnumch-multiples-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/gnumch-multiples-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/gnumch-multiples-activity/Makefile.am	Sun Mar 23 16:23:59 2008
@@ -22,8 +22,6 @@
 # in the xml files directly, this is needed for the tool gcompris2spip
 # INTLTOOL_XML_RULE@
 
-CLEANFILES = $(xml_DATA)
-
 icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 icon_DATA = gnumch-multiples.svg