Commit a9b4f53a authored by Yves Combe's avatar Yves Combe

Landing of GCOMPRIS_8_2_CROSSCOMPIL branch.

        Allow cross compilation for win32 with mingw/Linux.
        Use GLib functions instead of unix one .

        Adapt Tuxpaint launcher to make it work on Windows.
parent df642cc0
2006-11-09 Yves Combe <yves@ycombe.net>
Landing of GCOMPRIS_8_2_CROSSCOMPIL branch.
Allow cross compilation for win32 with mingw/Linux.
Use GLib functions instead of unix one .
Adapt Tuxpaint launcher to make it work on Windows.
* Makefile.am:
* Makefile.mingw.in:
* README.mingw-cross:
* acinclude.m4:
* configure.in:
* cross-configure.sh:
* cross-make.sh:
* gcompris-installer.nsi.in:
* po/Makefile.in.in:
* src/boards/Makefile.am:
* src/boards/Makefile.mingw:
* src/boards/advanced_colors.c: (colors_next_level),
(colors_create_item):
* src/boards/algebra.c: (get_operand), (get_random_number):
* src/boards/algebra_guesscount.c: (generate_numbers):
* src/boards/awele.c: (initBoardGraphics), (updateNbBeans):
* src/boards/awele_alphaBeta.c: (firstChild):
* src/boards/awele_utils.c: (randplay):
* src/boards/click_on_letter.c: (click_on_letter_create_item):
* src/boards/clickgame.c: (clickgame_create_item), (game_won):
* src/boards/clockgame.c: (get_random_hour):
* src/boards/colors.c: (start_board):
* src/boards/crane.c: (shuffle_list):
* src/boards/enumerate.c: (enumerate_create_item):
* src/boards/erase.c: (shuffle_image_list):
* src/boards/fifteen.c: (scramble):
* src/boards/gletters.c: (gletters_create_item):
* src/boards/gtans.c:
* src/boards/gtans_support.c: (check_file_exists):
* src/boards/hanoi.c: (hanoi_create_item):
* src/boards/imageid.c: (imageid_create_item):
* src/boards/leftright.c: (leftright_create_item):
* src/boards/machpuzzle.c: (minigolf_create_item):
* src/boards/magic_hat.c: (magic_hat_create_item):
* src/boards/maze.c: (maze_next_level), (generateMaze):
* src/boards/memory.c: (get_random_token), (get_image), (tux_play):
* src/boards/missingletter.c: (missing_letter_create_item):
* src/boards/money.c: (money_next_level):
* src/boards/paratrooper.c: (paratrooper_next_level),
(paratrooper_create_cloud):
* src/boards/planegame.c: (planegame_create_item):
* src/boards/py-mod-gcompris.c: (py_gcompris_child_watch_add),
(py_gcompris_spawn_async):
* src/boards/python/tuxpaint.py:
* src/boards/railroad.c: (railroad_create_item):
* src/boards/read_colors.c: (start_board):
* src/boards/reading.c: (display_what_to_do):
* src/boards/reversecount.c: (display_random_fish):
* src/boards/shapegame.c: (parse_doc):
* src/boards/smallnumbers.c: (smallnumbers_create_item):
* src/boards/submarine.c: (submarine_create_item):
* src/boards/superbrain.c: (superbrain_next_level):
* src/boards/target.c: (display_windspeed):
* src/boards/wordsgame.c: (wordsgame_create_item):
* src/gcompris/Makefile.am:
* src/gcompris/Makefile.mingw:
* src/gcompris/binreloc.c: (_br_find_exe):
* src/gcompris/board.c: (gc_board_pause):
* src/gcompris/board.h:
* src/gcompris/bonus.c: (gc_bonus_display), (bonus_image):
* src/gcompris/file_selector.c: (parse_doc):
* src/gcompris/gameutil.c: (gc_util_create_rootdir):
* src/gcompris/gameutil.h:
* src/gcompris/gcompris.c: (activation_done), (load_properties),
(gc_init):
* src/gcompris/gcompris_db.c: (gc_db_init):
* src/gcompris/images_selector.c: (parse_doc):
* src/gcompris/menu.c: (gc_menu_load):
* src/gcompris/properties.c: (gc_prop_user_root_directory_get),
(gc_prop_config_file_get), (gc_prop_new):
* src/gcompris/sdlplayer.c: (errorv):
2006-11-07 Bruno coudoin <bruno.coudoin@free.fr>
- Removed unused `no_undefined'
......
## Process this file with automake to produce Makefile.in
if !BUILD_MINGW32
if TEXINFO
DOCS_SUBDIR=docs
else
DOCS_SUBDIR=
endif
else
DOCS_SUBDIR=
endif
SUBDIRS = po src boards $(DOCS_SUBDIR) autopackage
icondir=$(datadir)/pixmaps
icon_DATA = gcompris.png gcompris-edit.png
if BUILD_MINGW32
Applicationsdir = $(datadir)/
Applications_in_files =
Applications_DATA =
Menudir=$(prefix)
Menu_DATA=
else
Applicationsdir = $(datadir)/applications/
Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
Applications_DATA = gcompris.desktop gcompris-edit.desktop
Menudir=$(prefix)/lib/menu
Menu_DATA=gcompris
endif
@INTLTOOL_DESKTOP_RULE@
......
......@@ -18,7 +18,7 @@ LIBXML2_TOP := /libxml2
SDL_TOP := /sdl
CANVAS_TOP := /gnomecanvas
GNUCHESS_TOP := /gnuchess
PYTHON_DLL := /c/WINDOWS/system32/python24.dll
PYTHON_TOP := /c/WINDOWS/system32/python24.dll
GNUCAP_TOP := /gnucap
MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
......@@ -26,7 +26,7 @@ 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 \
$(PYTHON_DLL) \
$(PYTHON_TOP)/python24.dll \
$(GNUCAP_TOP)/src/MSW/gnucap.exe \
$(GTK_TOP)/bin/gspawn-win32-helper.exe \
$(GNUCHESS_TOP)/bin/gnuchess.exe \
......@@ -136,7 +136,7 @@ prep:
@echo "Copy pixmap"
mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
@echo remove tuxpaint activity
@remove tuxpaint activity
rm -f $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards/tuxpaint.xml
@echo "Create the file gcompris-win-prepack.tar.gz"
tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis tools
How to cross compile GCompris for windows with mingw on GNU/Linux
You need:
========
You need cross version of mingw, wich is available in all good distribution.
You have to install all mingw/windows version of your dev librairies somewhere.
You have to adapt cross-configure.sh with the places where you put this libs.
The scripts:
============
There is two script: cross-configure.sh and cross-make.sh. They are stolen from libsdl version: http://www.libsdl.org/extras/win32/cross/README.txt
You can use them as configure and make, but you need to adapt them in your configuration. cross-configure.sh has a couple of lines for each library.
Check TARGET too, TARGET is used tu set name of your compilators (gcc is i586-mingw32msvc-gcc when TARGET=i586-mingw32msvc)
You have to set the PREFIX in cross-configure.sh to indicate where to install all the stuff.
Library warning
===============
You need lib*.a version of libraries if you want compile with -shared modules. You can make them from dll/def/lib using pexport/dlltool (i586-mingw32msvc-dlltool) if they are missing (e.g. sqlite.org gives only dll and def).
Read http://www.go-evolution.org/Building_Evolution_on_Windows#libxml2 for an exemple with libxml2
Libxml2
=======
The windows dev version is missing pc file for pkg-config.
Read that: http://www.go-evolution.org/Building_Evolution_on_Windows#libxml2
I have wrote a pc file for it :
--------------------------
prefix=/home/ycombe/Win32/98/libxml2-2.6.26.win32
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libXML
Version: 2.6.26
Description: libXML library version 2.
Requires:
Libs: -L${libdir} -llibxml2 -lz
--------------------------
......@@ -43,18 +43,25 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
[AC_REQUIRE([AM_PATH_PYTHON])
AC_MSG_CHECKING(for headers required to compile python extensions)
dnl deduce PYTHON_CFLAGS
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYTHON_CFLAGS="-I${py_prefix}/include/python${PYTHON_VERSION}"
python_link=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBRARY\")" | sed -e "s%lib\(.*\)\.[[a-zA-Z]]*$%-l\1%"`
if test "x$PYTHON_CFLAGS" = "x" ; then
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"`
PYTHON_CFLAGS="-I${py_prefix}/include/python${PYTHON_VERSION}"
PYTHON_LIBS="-L${python_libdir} ${python_link}"
if test "$py_prefix" != "$py_exec_prefix"; then
PYTHON_CFLAGS="$PYTHON_CFLAGS -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
if test "$py_prefix" != "$py_exec_prefix"; then
PYTHON_CFLAGS="$PYTHON_CFLAGS -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
fi
fi
if test "x$PYTHON_LIBS" = "x" ; then
python_link=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBRARY\")" | sed -e "s%lib\(.*\)\.[[a-zA-Z]]*$%-l\1%"`
python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"`
PYTHON_LIBS="-L${python_libdir} ${python_link}"
fi
AC_SUBST(PYTHON_CFLAGS)
......
......@@ -63,10 +63,24 @@ AM_PROG_LIBTOOL
dnl Check for SDL
SDL_VERSION=1.2.3
AM_PATH_SDL($SDL_VERSION,
cflags_previous=$CFLAGS
libs_previous=$LIBS
if test "x$SDL_CFLAGS" = "x" -o "x$SDL_LIBS" = "x" ; then
AM_PATH_SDL($SDL_VERSION,
:,
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
)
)
else
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
echo "*** Not checking SDL. Using existing SDL_FLAGS and SDL_LIBS ***"
fi
dnl RESTAURE PREVIOUSLY SET VALUES
CFLAGS=$cflags_previous
LIBS=$libs_previous
dnl GNOME2 GNOME_X_CHECKS
AM_PATH_GLIB_2_0
......@@ -218,27 +232,55 @@ dnl
dnl === DIRECTORY DEFINITIONS ===
dnl
dnl Set PACKAGE_LOCALE_DIR in config.h.
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
if test "x$platform_win32" = "xno" ; then
dnl Set PACKAGE_DATA_DIR
PACKAGE_DATA_DIR="boards"
AC_SUBST(PACKAGE_DATA_DIR)
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
dnl Set PACKAGE_LOCALE_DIR in config.h.
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
dnl Set PACKAGE_HELP_DIR
PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"
AC_SUBST(PACKAGE_HELP_DIR)
dnl Set PACKAGE_DATA_DIR
PACKAGE_DATA_DIR="boards"
AC_SUBST(PACKAGE_DATA_DIR)
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
dnl Plugin Directory
my_libdir=`eval echo "${libdir}"`
AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
plugindir=$libdir/gcompris
AC_SUBST(plugindir)
dnl Set PACKAGE_HELP_DIR
PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"
AC_SUBST(PACKAGE_HELP_DIR)
dnl Plugin Directory
my_libdir=`eval echo "${libdir}"`
AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
plugindir=$libdir/gcompris
AC_SUBST(plugindir)
dnl Python plugin Directory
PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
AC_SUBST(PYTHON_PLUGIN_DIR)
else
DATADIRNAME="share"
dnl Python plugin Directory
PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
AC_SUBST(PYTHON_PLUGIN_DIR)
dnl Set PACKAGE_LOCALE_DIR in config.h for WINDOWS
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "../${DATADIRNAME}/locale", [GCompris locale directory])
dnl Set PACKAGE_DATA_DIR
PACKAGE_DATA_DIR="boards"
AC_SUBST(PACKAGE_DATA_DIR)
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "../${DATADIRNAME}", [GCompris data directory])
dnl Set PACKAGE_HELP_DIR
PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/gnome/help/gcompris"
AC_SUBST(PACKAGE_HELP_DIR)
dnl Plugin Directory
AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "../${DATADIRNAME}", [Gcompris plugins directory])
plugindir=${myprefix}/${DATADIRNAME}/gcompris
AC_SUBST(plugindir)
dnl Python plugin Directory
PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/gcompris/python"
AC_SUBST(PYTHON_PLUGIN_DIR)
fi
dnl Test for gnuchess
AC_PATH_PROG(GNUCHESS, gnuchess,no,[/usr/bin:/usr/games:/usr/local/bin:$PATH])
......@@ -295,6 +337,7 @@ else
if test x$python_path != xnot ; then
PYTHON=$python_path
fi
AM_PATH_PYTHON(2.2)
AM_CHECK_PYTHON_HEADERS( [build_python_plugin="yes"], [build_python_plugin="no"] )
......@@ -342,10 +385,11 @@ else
AC_MSG_WARN([py-build-only: Do not forget to install pygtk, pysqlite2])
fi
if test x$with_sqlite = xyes; then
fi
if test x$with_sqlite = xyes; then
PKG_CHECK_MODULES(SQLITE3, sqlite3,, AC_MSG_ERROR([*** SQLITE3 not found!]))
AC_DEFINE([USE_SQLITE], 1,[SQLITE Database, Profiles are enabled])
fi
fi
AM_CONDITIONAL(USE_SQLITE, test x$with_sqlite = xyes)
......@@ -455,7 +499,31 @@ AC_SUBST(VERSION_VOICES_SV)
VERSION_VOICES_TR=1.0
AC_SUBST(VERSION_VOICES_TR)
dnl mingw32 specific stuff.
dnl use libgw32c
dnl define __GW32__ and WIN32
# Check platform - see if WinMain needed:
AC_MSG_CHECKING([for native Win32])
case "$host" in
*-*-mingw*)
native_win32=yes
;;
*)
native_win32=no
;;
esac
AC_MSG_RESULT([$native_win32])
AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
if test "$native_win32" = yes; then
LIBS="$LIBS -luuid -lole32 -lwsock32 -mno-cygwin -mms-bitfields -mwindows -mconsole"
#CFLAGS="$CFLAGS -D__GW32__ -DWIN32 -I$CROSS_ROOT/include -I$CROSS_ROOT/include/glibc"
#CFLAGS="$CFLAGS -DWIN32"
fi
AC_SUBST(CFLAGS)
AC_SUBST(LIBS)
dnl Autoconf output
AC_OUTPUT([ gcompris.spec
......
#!/bin/sh
# adapted from http://www.libsdl.org/extras/win32/cross/README.txt
CONFIG_SHELL=/bin/sh
export CONFIG_SHELL
TARGET=i586-mingw32msvc
CROSS_DEV=/home/ycombe/Win32/98
PATH="$PATH:$CROSS_DEV/bin"
export PATH
#PYTHON is copied from a windows install (with pygtk, pycairo, pysqlite) into:
# $CROSS_DEV/Python24/
#########################################
# Libs using pkg-config
#
# rem: for me libxml2 as and hand-written pc file
#
# PKG_CONFIG in cross-configuration.
PKG_CONFIG_LIBDIR="$CROSS_DEV/lib/pkgconfig:$CROSS_DEV/Python24/Lib/pkgconfig"
DIRS="$(ls $CROSS_DEV)"
# all my libs are in $CROSS_DEV/__libname__/
# the *.pc files needs there prefix adapted
for f in $DIRS; do
if test -d $CROSS_DEV/$f/lib/pkgconfig ; then
PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$CROSS_DEV/$f/lib/pkgconfig" ;
fi
done
# /PKG_CONFIG
#########################################
#########################################
# PYTHON
export PKG_CONFIG_LIBDIR
export PKG_CONFIG_PATH
PYTHONHOME="$CROSS_DEV/Python24"
PYTHONPATH="$CROSS_DEV/Python24/Lib"
PYTHON_CFLAGS="-I$CROSS_DEV/Python24/include"
PYTHON_LIBS="-L$CROSS_DEV/Python24/libs -lpython24"
# GCompris configure will skip PYTHON_TEST if this is exported:
export PYTHONHOME
export PYTHONPATH
export PYTHON_CFLAGS
export PYTHON_LIBS
# /PYTHON
##########################################
##########################################
# SDL and SDL_mixer
SDL_MIXER_CFLAGS="-I$CROSS_DEV/SDL_mixer/SDL_mixer-1.2.7/include"
SDL_MIXER_LDFLAGS="-L$CROSS_DEV/SDL_mixer/SDL_mixer-1.2.7/lib"
SDL_CFLAGS="-I$CROSS_DEV/SDL/SDL-1.2.11/include"
SDL_LIBS="-L$CROSS_DEV/SDL/SDL-1.2.11/lib -lSDLmain -lSDL"
# GCompris configure will skip SDL_TEST if this is exported:
export SDL_CFLAGS
export SDL_LIBS
CFLAGS="-g -O2 -I$CROSS_DEV/include $SDL_MIXER_CFLAGS"
LDFLAGS="-L$CROSS_DEV/lib $SDL_MIXER_LDFLAGS"
# /SDL and SDL_mixer
###########################################
###########################################
# These libs do not use pkg-config !
# popt
CFLAGS="$CFLAGS -I$CROSS_DEV/popt/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/popt/lib"
# sqlite3
CFLAGS="$CFLAGS -I$CROSS_DEV/sqlite/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/sqlite/lib"
# /sqlite3
#libiconv
CFLAGS="$CFLAGS -I$CROSS_DEV/libiconv/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/libiconv/lib"
#gettext
CFLAGS="$CFLAGS -I$CROSS_DEV/gettext/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/gettext/lib"
#zlib
CFLAGS="$CFLAGS -I$CROSS_DEV/zlib/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/zlib/lib"
# LIBXML2
# !!!!!! libxml2 if it does not hace pc file
# adapt CFLAGS
# adapt LDFLAGS
############################################
cache=cross-config.cache
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" sh configure --cache-file="$cache" \
--target=$TARGET --host=$TARGET --build=i386-linux \
--enable-py-build-only \
--with-sdl-prefix="$CROSS_DEV/SDL/SDL-1.2.11" \
--disable-binreloc \
$*
status=$?
rm -f "$cache"
exit $status
#!/bin/sh
# copied from http://www.libsdl.org/extras/win32/cross/README.txt
PREFIX=/usr/local/cross-tools
TARGET=i386-mingw32msvc
PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH"
export PATH
exec make $*
......@@ -215,27 +215,32 @@ Section -SecUninstallOldGcompris
StrCmp $R2 "" uninstall_problem
; Check if we have uninstall string..
IfFileExists $R3 0 uninstall_problem
; Have uninstall string.. go ahead and uninstall.
MessageBox MB_YESNO "Uninstall your previous version of GCompris?" IDYES do_uninstall IDNO done
do_uninstall:
; Have uninstall string.. go ahead and uninstall.
SetOverwrite on
; Need to copy uninstaller outside of the install dir
ClearErrors
CopyFiles /SILENT $R3 "$TEMP\${GCOMPRIS_UNINST_EXE}"
SetOverwrite off
IfErrors uninstall_problem
; Ready to uninstall..
ClearErrors
ExecWait '"$TEMP\${GCOMPRIS_UNINST_EXE}" /S _?=$R1'
IfErrors exec_error
Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
Goto done
; In this case just wipe out previous Gcompris install dir..
; We get here because versions 0.60a1 and 0.60a2 don't have versions set in the registry
; and versions 0.60 and lower did not correctly set the uninstall reg string
; (the string was set in quotes)
MessageBox MB_YESNO $(GCOMPRIS_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install
cancel_install:
Quit
exec_error:
Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
Goto uninstall_problem
SetOverwrite on
; Need to copy uninstaller outside of the install dir
ClearErrors
CopyFiles /SILENT $R3 "$TEMP\${GCOMPRIS_UNINST_EXE}"
SetOverwrite off
IfErrors uninstall_problem
; Ready to uninstall..
ClearErrors
ExecWait '"$TEMP\${GCOMPRIS_UNINST_EXE}" /S _?=$R1'
IfErrors exec_error
Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
Goto done
exec_error:
Delete "$TEMP\${GCOMPRIS_UNINST_EXE}"
Goto uninstall_problem
uninstall_problem:
; In this case just wipe out previous Gcompris install dir..
......@@ -243,9 +248,7 @@ Section -SecUninstallOldGcompris
; and versions 0.60 and lower did not correctly set the uninstall reg string
; (the string was set in quotes)
IfSilent do_wipeout
MessageBox MB_YESNO $(GCOMPRIS_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install
cancel_install:
Quit
MessageBox MB_YESNO "Uninstall previous version?" IDYES do_wipeout IDNO done
do_wipeout:
StrCmp $R0 "HKLM" gcompris_del_lm_reg gcompris_del_cu_reg
......@@ -428,7 +431,6 @@ Section Uninstall
Delete "$INSTDIR\pangocairo.pyd"
Delete "$INSTDIR\popt1.dll"
Delete "$INSTDIR\pthreadGC.dll"
Delete "$INSTDIR\python24.dll"
Delete "$INSTDIR\python24.zip"
Delete "$INSTDIR\select.pyd"
Delete "$INSTDIR\setup.py"
......
......@@ -22,7 +22,6 @@ PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
......@@ -34,18 +33,17 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
localedir = $(libdir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
DATADIRNAME = @DATADIRNAME@
itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
install_sh = @install_sh@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
# Automake >= 1.8 provides @mkdir_p@.
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
......@@ -54,32 +52,22 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
DEFS = @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
INCLUDES = -I.. -I$(top_srcdir)/intl
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
SOURCES =
POFILES = @POFILES@
GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
$(POFILES) $(SOURCES)
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
#This Gets Replace for some reason
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o:
$(COMPILE) $<
.SUFFIXES: .po .pox .gmo .mo .msg .cat
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
......@@ -94,7 +82,7 @@ INSTOBJEXT = @INSTOBJEXT@
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
&& rm -f $@ && gencat $@ $*.msg
all: all-@USE_NLS@
......@@ -105,120 +93,98 @@ all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
install: install-exec install-data
install-exec:
install: install-data
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
$(mkdir_p) $(DESTDIR)$(itlocaledir)
if test -n "$(PO_LINGUAS)"; then \
linguas="$(PO_LINGUAS)"; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
*.gmo) destdir=$(gnulocaledir);; \
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
linguas="$(ALL_LINGUAS)"; \
fi; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
$(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $(srcdir)/$$lang.gmo as" \
"$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
if test -r $$lang.gmo.m; then \
$(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
if test -r $(srcdir)/$$lang.gmo.m ; then \
$(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
$$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $(srcdir)/$$lang.gmo.m as" \
"$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
true; \
fi; \
fi; \
done
if test "$(PACKAGE)" = "glib"; then \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
# Empty stubs to satisfy archaic automake needs
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
installcheck:
uninstall:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
if test -n "$(PO_LINGUAS)"; then \