gcompris r3586 - in trunk: . boards boards/babymatch boards/babyshapes boards/chronos boards/doubleentry boards/geography boards/geography_country boards/imagename boards/paintings docs/eu docs/fr src/boards src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Oct 28 23:07:09 2008
New Revision: 3586
URL: http://svn.gnome.org/viewvc/gcompris?rev=3586&view=rev

Log:
configure fixes and cleanup by Yavor Doganov.
It is no more needed to copy config.rpath localy.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/boards/babymatch/Makefile.am
   trunk/boards/babyshapes/Makefile.am
   trunk/boards/chronos/Makefile.am
   trunk/boards/doubleentry/Makefile.am
   trunk/boards/geography/Makefile.am
   trunk/boards/geography_country/Makefile.am
   trunk/boards/imagename/Makefile.am
   trunk/boards/mosaic.xml.in
   trunk/boards/paintings/Makefile.am
   trunk/configure.in
   trunk/docs/eu/Makefile.am
   trunk/docs/fr/Makefile.am
   trunk/src/boards/Makefile.am
   trunk/src/gcompris/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -57,16 +57,18 @@
 	config.h.mingw.in Makefile.mingw.in global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
 	gcompris-installer.nsi.in
 
-
 distcore = $(PACKAGE)-core-$(VERSION)
 
 install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \
-	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --mode 644 * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf - ; find -type d -exec chmod 755 '{}' \;) ; cd .. ; \
 	fi
 
+uninstall-local:
+	-find $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) -name '*' -delete
+
 dist-hook:
 	if test -d $(PACKAGE_DATA_DIR); then \
 	  $(mkinstalldirs) $(distdir)/$(PACKAGE_DATA_DIR); \
@@ -74,7 +76,8 @@
 	fi
 
 
-CONFIG_CLEAN_FILES = gcompris.desktop gcompris-edit.desktop config.h.mingw
+CONFIG_CLEAN_FILES = gcompris.desktop gcompris-edit.desktop config.h.mingw \
+			gcompris-installer.nsi Makefile.mingw
 
 clean-local:
 	rm -f intltool-extract intltool-merge intltool-update

Modified: trunk/boards/babymatch/Makefile.am
==============================================================================
--- trunk/boards/babymatch/Makefile.am	(original)
+++ trunk/boards/babymatch/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -20,6 +20,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/babyshapes/Makefile.am
==============================================================================
--- trunk/boards/babyshapes/Makefile.am	(original)
+++ trunk/boards/babyshapes/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -25,6 +25,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/chronos/Makefile.am
==============================================================================
--- trunk/boards/chronos/Makefile.am	(original)
+++ trunk/boards/chronos/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -26,6 +26,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/doubleentry/Makefile.am
==============================================================================
--- trunk/boards/doubleentry/Makefile.am	(original)
+++ trunk/boards/doubleentry/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -16,6 +16,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/geography/Makefile.am
==============================================================================
--- trunk/boards/geography/Makefile.am	(original)
+++ trunk/boards/geography/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -21,6 +21,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/geography_country/Makefile.am
==============================================================================
--- trunk/boards/geography_country/Makefile.am	(original)
+++ trunk/boards/geography_country/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -24,6 +24,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/imagename/Makefile.am
==============================================================================
--- trunk/boards/imagename/Makefile.am	(original)
+++ trunk/boards/imagename/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -19,6 +19,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/boards/mosaic.xml.in
==============================================================================
--- trunk/boards/mosaic.xml.in	(original)
+++ trunk/boards/mosaic.xml.in	Tue Oct 28 23:07:09 2008
@@ -12,7 +12,7 @@
         <_description >Rebuild the mosaic</_description>
         <_prerequisite></_prerequisite>
         <_goal></_goal>
-        <_manual>Rebuild the left mosaic on the right area. Then, select a color in the bottom area and click on grey boxes to paint them.</_manual>
+        <_manual>Rebuild the left mosaic on the right area. Select a color in the bottom area and click on grey boxes to paint them.</_manual>
         <_credit></_credit>
   </Board>
   <Data directory=""/>

Modified: trunk/boards/paintings/Makefile.am
==============================================================================
--- trunk/boards/paintings/Makefile.am	(original)
+++ trunk/boards/paintings/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -20,6 +20,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 28 23:07:09 2008
@@ -2,7 +2,7 @@
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.4.7)
+AM_INIT_AUTOMAKE(gcompris, 8.4.8)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -153,8 +153,6 @@
 dnl glib-genmarshal
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
-AM_ICONV
-
 dnl XF86VidMode allows us to set the screen resolution dynamically
 AC_PATH_X
 

Modified: trunk/docs/eu/Makefile.am
==============================================================================
--- trunk/docs/eu/Makefile.am	(original)
+++ trunk/docs/eu/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -15,11 +15,11 @@
 # FIXME: Is it possible to have I18N info files installed ?
 #info_TEXINFOS = gcompris.texi
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
-	$(INSTALL_DATA)  gcompris.html $(DESTDIR)$(gcompris_helpdir)
-	$(INSTALL_DATA)  $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
-	$(INSTALL_DATA)  $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
+# install-data-local:
+#      $(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
+#      $(INSTALL_DATA)  gcompris.html $(DESTDIR)$(gcompris_helpdir)
+#      $(INSTALL_DATA)  $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
+#      $(INSTALL_DATA)  $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
 
 gcompris.html: gcompris.texi
 	texi2html -monolithic $<

Modified: trunk/docs/fr/Makefile.am
==============================================================================
--- trunk/docs/fr/Makefile.am	(original)
+++ trunk/docs/fr/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -15,11 +15,11 @@
 # FIXME: Is it possible to have I18N info files installed ?
 #info_TEXINFOS = gcompris.texi
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
-	$(INSTALL_DATA)  gcompris.html $(DESTDIR)$(gcompris_helpdir)
-	$(INSTALL_DATA)  $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
-	$(INSTALL_DATA)  $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
+# install-data-local:
+#      $(mkinstalldirs) $(DESTDIR)$(gcompris_helpdir)
+#      $(INSTALL_DATA)  gcompris.html $(DESTDIR)$(gcompris_helpdir)
+#      $(INSTALL_DATA)  $(srcdir)/overview.jpg $(DESTDIR)$(gcompris_helpdir)
+#      $(INSTALL_DATA)  $(srcdir)/topic.dat $(DESTDIR)$(gcompris_helpdir)
 
 gcompris.html: gcompris.texi
 	texi2html -monolithic $<

Modified: trunk/src/boards/Makefile.am
==============================================================================
--- trunk/src/boards/Makefile.am	(original)
+++ trunk/src/boards/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -77,8 +77,7 @@
 
 libdir = $(plugindir)
 INCLUDES = \
-	-I$(top_builddir)/src \
-	-I$(top_builddir)/intl \
+	-I$(top_srcdir)/src \
 	$(GCOMPRIS_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PYTHON_CFLAGS) \

Modified: trunk/src/gcompris/Makefile.am
==============================================================================
--- trunk/src/gcompris/Makefile.am	(original)
+++ trunk/src/gcompris/Makefile.am	Tue Oct 28 23:07:09 2008
@@ -46,9 +46,8 @@
 bin_PROGRAMS = gcompris
 
 INCLUDES = \
-	-I$(top_builddir)/intl \
 	-DDATADIR=\""$(datadir)"\" \
-	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src \
 	$(GCOMPRIS_CFLAGS) \
 	$(GNOME_INCLUDEDIR) \
 	$(XML_CFLAGS) \
@@ -132,4 +131,4 @@
 	Makefile.mingw gcomprisrc.rc
 
 
-gcompris_nsbundle_CPPFLAGS = -fconstant-string-class=NSConstantString
\ No newline at end of file
+gcompris_nsbundle_CPPFLAGS = -fconstant-string-class=NSConstantString