Commit f5575e7f authored by Bruno Coudoin's avatar Bruno Coudoin

removed double entry of CLEAN in some makefiles

commented out gnet in the configure as it doesn't work anymore

svn path=/branches/gcomprixogoo/; revision=3342
parent 1d50e80e
......@@ -390,19 +390,19 @@ AC_ARG_ENABLE(sqlite,
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)])
......
......@@ -46,8 +46,6 @@ $(xml_DATA): %.xml: %.xml.in
# 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
......
......@@ -25,8 +25,6 @@ $(xml_DATA): %.xml: %.xml.in
# 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
......
......@@ -25,8 +25,6 @@ $(xml_DATA): %.xml: %.xml.in
# 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
......
......@@ -19,8 +19,6 @@ $(xml_DATA): %.xml: %.xml.in
# 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
......
......@@ -19,8 +19,6 @@ $(xml_DATA): %.xml: %.xml.in
# 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
......
......@@ -22,8 +22,6 @@ $(xml_DATA): %.xml: %.xml.in
# 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment