- Updated windows makefiles

	- Cleanup configure.in to no more depend on pyxml and python-gnome.

5 files changed, 30 insertions, 130 deletions

diff --git a/ChangeLog b/ChangeLog
index b1ba856..e5c2819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-18  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Updated windows makefiles
+	- Cleanup configure.in to no more depend on pyxml and python-gnome.
+
+	* Makefile.mingw:
+	* Makefile.mingw.in:
+	* configure.in:
+	* boards/colors.xml.in: fixed goal, it has a newline that break translations.
+
 2006-10-17  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- Aplied patch from Hans de Goede
diff --git a/Makefile.mingw b/Makefile.mingw
deleted file mode 100644
index a148347..0000000
--- a/Makefile.mingw
+++ /dev/null
@@ -1,120 +0,0 @@
-# Makefile.mingw
-#
-# Author: Bruno Coudoin (from GAIM example)
-# Description: Top Makefile for win32 (mingw) port of GCompris
-#
-
-VERSION = "8.2"
-
-pkgdatadir = gcompris
-
-GCOMPRIS_SRC = ./src/gcompris
-GCOMPRIS_BOARDS = ./src/boards
-GCOMPRIS_INSTALL_DIR = ./win32-install-dir
-
-GTK_TOP :=		/gtk
-GNUWIN32_TOP :=		/gnuwin32
-LIBXML2_TOP :=		/libxml2
-SDL_TOP :=		/sdl
-CANVAS_TOP :=		/gnomecanvas
-GNUCHESS_TOP :=		/gnuchess
-
-MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
-
-# These will be copied in the win32-install-dir ready to be packaged.
-NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC.dll \
-			$(GNUCHESS_TOP)/bin/libreadline.dll \
-			$(GTK_TOP)/bin/gspawn-win32-helper.exe \
-			$(GNUCHESS_TOP)/bin/gnuchess.exe \
-			$(GNUWIN32_TOP)/bin/popt1.dll \
-			$(GNUWIN32_TOP)/bin/libintl-2.dll \
-			$(GNUWIN32_TOP)/bin/libiconv-2.dll \
-			$(CANVAS_TOP)/bin/libgnomecanvas-2-0.dll \
-			$(SDL_TOP)/bin/SDL.dll \
-			$(SDL_TOP)/bin/SDL_mixer.dll \
-			$(LIBXML2_TOP)/bin/libxml2.dll \
-			$(GTK_TOP)/bin/freetype6.dll \
-			$(GTK_TOP)/bin/intl.dll \
-			$(GTK_TOP)/bin/libart_lgpl_2-2.dll \
-			$(GTK_TOP)/bin/freetype6.dll \
-			$(GTK_TOP)/bin/libart_lgpl_2-2.dll \
-			$(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \
-			$(GTK_TOP)/bin/libgdk_pixbuf-2.0-0.dll \
-			$(GTK_TOP)/bin/libglib-2.0-0.dll \
-			$(GTK_TOP)/bin/libgmodule-2.0-0.dll \
-			$(GTK_TOP)/bin/libgobject-2.0-0.dll \
-			$(GTK_TOP)/bin/libpango-1.0-0.dll \
-			$(GTK_TOP)/bin/libpangowin32-1.0-0.dll \
-			$(GTK_TOP)/bin/libpangoft2-1.0-0.dll \
-			$(GTK_TOP)/bin/libgtk-win32-2.0-0.dll \
-			$(GTK_TOP)/bin/libatk-1.0-0.dll \
-			$(GTK_TOP)/bin/libfontconfig-1.dll \
-			$(GTK_TOP)/bin/zlib1.dll \
-			$(GTK_TOP)/bin/libgthread-2.0-0.dll \
-			$(GTK_TOP)/expat/bin/xmlparse.dll \
-			$(GTK_TOP)/expat/bin/xmltok.dll \
-			$(GTK_TOP)/bin/iconv.dll \
-			$(GTK_TOP)/bin/intl.dll \
-			$(GTK_TOP)/bin/libpng12.dll \
-			$(GTK_TOP)/bin/jpeg62.dll
-
-NEEDED_FILES =		README \
-			COPYING \
-			COPYING \
-			Changelog
-
-##
-##
-
-all:
-	cp config.h.mingw config.h
-	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw
-	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw
-
-
-install: all
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
-	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw install
-	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install
-
-# Copy mandratory files for the package in the package directory
-prepack:
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK
-	cp $(NEEDED_DLLS) $(GCOMPRIS_INSTALL_DIR)
-	cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR)
-	cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR)
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK/share
-	cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib
-	cp -r $(GTK_TOP)/lib/locale $(GCOMPRIS_INSTALL_DIR)/lib
-	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
-	cp -r $(GTK_TOP)/lib/pango $(GCOMPRIS_INSTALL_DIR)/lib
-
-
-installer:
-	$(MAKENSIS) gcompris-installer.nsi
-
-clean:
-	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean
-	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean
-	rm -rf config.h
-	rm -rf gcompris*.exe
-
-#
-# Run this on Linux to prepare datadir for windows
-#
-prep:
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards
-	cd boards ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
-	@echo "-------------------------------------------------------------------------------"
-	@echo " WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST"
-	@echo "-------------------------------------------------------------------------------"
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/locale
-	cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/share/locale/
-	@echo "Remove other .mo file not from gcompris"
-	find ./win32-install-dir/share/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
-	@echo "Copy pixmap"
-	mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
-	cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
-	@echo "Create the file gcompris-win-prepack.tar.gz"
-	tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 6cb8f58..fd0485d 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -35,6 +35,8 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC.dll \
 			$(LIBXML2_TOP)/bin/libxml2.dll \
 			$(GTK_TOP)/bin/freetype6.dll \
 			$(GTK_TOP)/bin/intl.dll \
+			$(GTK_TOP)/bin/libcairo-2.dll \
+			$(GTK_TOP)/bin/libpangocairo-1.0-0.dll \
 			$(GTK_TOP)/bin/libart_lgpl_2-2.dll \
 			$(GTK_TOP)/bin/freetype6.dll \
 			$(GTK_TOP)/bin/libart_lgpl_2-2.dll \
@@ -55,7 +57,7 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC.dll \
 			$(GTK_TOP)/expat/bin/xmltok.dll \
 			$(GTK_TOP)/bin/iconv.dll \
 			$(GTK_TOP)/bin/intl.dll \
-			$(GTK_TOP)/bin/libpng12.dll \
+			$(GTK_TOP)/bin/libpng13.dll \
 			$(GTK_TOP)/bin/jpeg62.dll
 
 NEEDED_FILES =		README \
@@ -76,6 +78,15 @@ install: all
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
 	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw install
 	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install
+	cp -r $(GCOMPRIS_BOARDS)/python $(GCOMPRIS_INSTALL_DIR)/share/gcompris
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/gcompris/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/admin/Makefile*
+	cp -r $(GCOMPRIS_BOARDS)/python $(GCOMPRIS_INSTALL_DIR)/share/gcompris
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/gcompris/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/admin/Makefile*
+
 
 # Copy mandratory files for the package in the package directory
 prepack:
@@ -104,6 +115,7 @@ clean:
 # Run this on Linux to prepare datadir for windows
 #
 prep:
+	mkdir $(GCOMPRIS_INSTALL_DIR)
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards
 	cd boards ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
 	@echo "-------------------------------------------------------------------------------"
diff --git a/boards/colors.xml.in b/boards/colors.xml.in
index 6368308..827bfa9 100644
--- a/boards/colors.xml.in
+++ b/boards/colors.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GCompris>
-  <Board 
+  <Board
 	 name="colors"
 	 type="colors"
 	 section="/discovery/colors_group"
@@ -12,8 +12,7 @@
 	 <_title>Colors</_title>
 	 <_description>Click on the right color</_description>
 	 <_prerequisite>Can move the mouse.</_prerequisite>
-	 <_goal>This board teaches you to recognize different colors. When you hear the name of the color, click on the duck wearing it.
-</_goal>
+	 <_goal>This board teaches you to recognize different colors. When you hear the name of the color, click on the duck wearing it.</_goal>
 	 <_manual>Listen to the color and click on the matching duck.</_manual>
   </Board>
 </GCompris>
diff --git a/configure.in b/configure.in
index c3d1c47..629fa99 100644
--- a/configure.in
+++ b/configure.in
@@ -310,15 +310,14 @@ REQUIRE_PYTHON=""
 if test x$build_python_plugin = xno; then
   AC_MSG_NOTICE([Python plugin is disabled.])
 else
-  dnl Python interpreter is available so check for pygtk and gnome-python
-  PKG_CHECK_MODULES(PYGTK, pygtk-2.0 gnome-python-2.0)
+  dnl Python interpreter is available so check for pygtk
+  PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
   if test x$py_build_only = xno; then
     AM_CHECK_PYMOD(gtk,,,AC_MSG_ERROR([*** pygtk installed but not visible from python ]))
-    AM_CHECK_PYMOD(gnome.canvas,,,AC_MSG_ERROR([*** pygtk installed but not visible from python ]))
-    AM_CHECK_PYMOD(xml.dom.DOMImplementation,,,AC_MSG_WARN([*** pyxml missing ]))
+    dnl AM_CHECK_PYMOD(xml.dom.DOMImplementation,,,AC_MSG_WARN([*** pyxml missing ]))
 
     dnl Set this variable for the .spec.in file
-    REQUIRE_PYTHON="python gnome-python gnome-python-canvas pygtk2.0"
+    REQUIRE_PYTHON="python pygtk2.0"
 
     dnl with gnome-python >= 2.10 gnome.canvas is obsolete. use gnomecanvas
     dnl gnomecanvas not supported yet in gcompris
@@ -336,7 +335,7 @@ else
 
   else
     AC_MSG_WARN([py-build-only: Skipping python modules dependancies])
-    AC_MSG_WARN([py-build-only: Do not forget to install pygtk, gnome-python, pysqlite2 and pyxml])
+    AC_MSG_WARN([py-build-only: Do not forget to install pygtk, pysqlite2])
   fi
 
   if test x$with_sqlite = xyes; then