gcompris r3587 - in branches/GCOMPRIS_8_3: . 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:27:34 2008
New Revision: 3587
URL: http://svn.gnome.org/viewvc/gcompris?rev=3587&view=rev

Log:
Configure fixed by Yavor Doganov, Merged from trunk #3586



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

Modified: branches/GCOMPRIS_8_3/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/Makefile.am	Tue Oct 28 23:27:34 2008
@@ -58,16 +58,18 @@
 	config.h.mingw.in Makefile.mingw.in global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
 	gcompris-installer.nsi.in gcompris-installer.nsi
 
-
 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 --exclude .xvpics --exclude "1[1-9].ogg"  --exclude "2?.ogg" * | ( 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); \
@@ -75,7 +77,8 @@
 	fi
 
 
-CLEANFILES = core-translation-report gcompris.desktop gcompris-edit.desktop gcompris.spec 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: branches/GCOMPRIS_8_3/boards/babymatch/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/boards/babymatch/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/boards/babymatch/Makefile.am	Tue Oct 28 23:27:34 2008
@@ -20,6 +20,4 @@
 $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
-
-
-
+CLEANFILES = $(xml_DATA)

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

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

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

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

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

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

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

Modified: branches/GCOMPRIS_8_3/configure.in
==============================================================================
--- branches/GCOMPRIS_8_3/configure.in	(original)
+++ branches/GCOMPRIS_8_3/configure.in	Tue Oct 28 23:27:34 2008
@@ -184,8 +184,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: branches/GCOMPRIS_8_3/docs/eu/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/docs/eu/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/docs/eu/Makefile.am	Tue Oct 28 23:27:34 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: branches/GCOMPRIS_8_3/docs/fr/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/docs/fr/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/docs/fr/Makefile.am	Tue Oct 28 23:27:34 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: branches/GCOMPRIS_8_3/src/boards/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/src/boards/Makefile.am	Tue Oct 28 23:27:34 2008
@@ -86,7 +86,6 @@
 libdir = $(plugindir)
 INCLUDES = \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/intl \
 	$(GCOMPRIS_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PYTHON_CFLAGS) \

Modified: branches/GCOMPRIS_8_3/src/gcompris/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/Makefile.am	Tue Oct 28 23:27:34 2008
@@ -46,8 +46,8 @@
 bin_PROGRAMS = gcompris
 
 INCLUDES = \
-	-I$(top_srcdir)/intl \
 	-DDATADIR=\""$(datadir)"\" \
+	-I$(top_srcdir)/src \
 	$(GCOMPRIS_CFLAGS) \
 	$(GNOME_INCLUDEDIR) \
 	$(XML_CFLAGS) \
@@ -128,11 +128,11 @@
 	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) $(SDL_LIBS) \
         $(INTLLIBS) $(NSBUNDLE_LDFLAGS)
 
-#	$(LIBICONV) 
+#	$(LIBICONV)
 
 
 EXTRA_DIST = \
 	Makefile.mingw gcomprisrc.rc
 
 
-gcompris_nsbundle_CPPFLAGS = -fconstant-string-class=NSConstantString
\ No newline at end of file
+gcompris_nsbundle_CPPFLAGS = -fconstant-string-class=NSConstantString