Commit 091bfc7e authored by Bruno Coudoin's avatar Bruno Coudoin

Minor, just re-formatted to fit 80 columns

parent 73289ca1
...@@ -2,27 +2,35 @@ How to cross compile GCompris for windows with mingw on GNU/Linux ...@@ -2,27 +2,35 @@ How to cross compile GCompris for windows with mingw on GNU/Linux
You need: You need:
======== ========
You need cross version of mingw, wich is available in all good distribution. You need cross version of mingw, which is available in all good distribution.
You have to install all mingw/windows version of your dev librairies somewhere. 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. You have to adapt cross-configure.sh with the places where you put this libs.
The scripts: 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 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. You can use them as configure and make, but you need to adapt them in your
Check TARGET too, TARGET is used tu set name of your compilators (gcc is i586-mingw32msvc-gcc when TARGET=i586-mingw32msvc) 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. You have to set the PREFIX in cross-configure.sh to indicate where to install
all the stuff.
Library warning 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). You need lib*.a version of libraries if you want compile with -shared modules.
Read http://www.go-evolution.org/Building_Evolution_on_Windows#libxml2 for an exemple with libxml2 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 Libxml2
======= =======
The windows dev version is missing pc file for pkg-config. The windows dev version is missing pc file for pkg-config.
Read that: http://www.go-evolution.org/Building_Evolution_on_Windows#libxml2 Read that: http://www.go-evolution.org/Building_Evolution_on_Windows#libxml2
I have wrote a pc file for it : I have wrote a pc file for it :
-------------------------- --------------------------
......
...@@ -146,3 +146,4 @@ educational software that rivals many proprietary ones. ...@@ -146,3 +146,4 @@ educational software that rivals many proprietary ones.
If somebody want to work on the profile concept, we will be abble to If somebody want to work on the profile concept, we will be abble to
provide these features at least 6 monthes earlier than what I can do. provide these features at least 6 monthes earlier than what I can do.
- source-contains-CVS-dir gnome2-macros/CVS
\ No newline at end of file
...@@ -22,6 +22,7 @@ PACKAGE = @PACKAGE@ ...@@ -22,6 +22,7 @@ PACKAGE = @PACKAGE@
VERSION = @VERSION@ VERSION = @VERSION@
SHELL = /bin/sh SHELL = /bin/sh
@SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
...@@ -33,17 +34,18 @@ exec_prefix = @exec_prefix@ ...@@ -33,17 +34,18 @@ exec_prefix = @exec_prefix@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
libdir = @libdir@ libdir = @libdir@
DATADIRNAME = @DATADIRNAME@ localedir = $(libdir)/locale
itlocaledir = $(prefix)/$(DATADIRNAME)/locale gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po subdir = po
install_sh = @install_sh@ install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@. mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@ GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
...@@ -52,22 +54,32 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ...@@ -52,22 +54,32 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist 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 GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) INCLUDES = -I.. -I$(top_srcdir)/intl
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) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) SOURCES =
POFILES = @POFILES@
GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
$(POFILES) $(SOURCES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \ POTFILES = \
#This Gets Replace for some reason
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) CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o:
$(COMPILE) $<
.po.pox: .po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
...@@ -82,7 +94,7 @@ CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else ...@@ -82,7 +94,7 @@ CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else
.po.cat: .po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \ sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && gencat $@ $*.msg && rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@ all: all-@USE_NLS@
...@@ -93,98 +105,120 @@ all-no: ...@@ -93,98 +105,120 @@ all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES) $(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT) $(GENPOT)
install: install-data install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@ install-data: install-data-@USE_NLS@
install-data-no: all install-data-no: all
install-data-yes: all install-data-yes: all
$(mkdir_p) $(DESTDIR)$(itlocaledir) if test -n "$(MKINSTALLDIRS)"; then \
if test -n "$(PO_LINGUAS)"; then \ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
linguas="$(PO_LINGUAS)"; \
else \ else \
linguas="$(ALL_LINGUAS)"; \ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi; \ fi
for lang in $$linguas; do \ @catalogs='$(CATALOGS)'; \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ for cat in $$catalogs; do \
$(mkdir_p) $$dir; \ cat=`basename $$cat`; \
if test -r $$lang.gmo; then \ case "$$cat" in \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ *.gmo) destdir=$(gnulocaledir);; \
echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ *) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \ else \
$(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
echo "installing $(srcdir)/$$lang.gmo as" \
"$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \ fi; \
if test -r $$lang.gmo.m; then \ if test -r $$cat; then \
$(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
else \ else \
if test -r $(srcdir)/$$lang.gmo.m ; then \ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
$(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ echo "installing $(srcdir)/$$cat as" \
$$dir/$(GETTEXT_PACKAGE).mo.m; \ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
echo "installing $(srcdir)/$$lang.gmo.m as" \ fi; \
"$$dir/$(GETTEXT_PACKAGE).mo.m"; \ 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"; \
else \ else \
true; \ true; \
fi; \ fi; \
fi; \ fi; \
done done
if test "$(PACKAGE)" = "glib"; then \
# Empty stubs to satisfy archaic automake needs if test -n "$(MKINSTALLDIRS)"; then \
dvi info tags TAGS ID: $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
# Define this as empty until I found a useful application. # Define this as empty until I found a useful application.
installcheck: installcheck:
uninstall: uninstall:
if test -n "$(PO_LINGUAS)"; then \ catalogs='$(CATALOGS)'; \
linguas="$(PO_LINGUAS)"; \ for cat in $$catalogs; do \
else \ cat=`basename $$cat`; \
linguas="$(ALL_LINGUAS)"; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
fi; \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
for lang in $$linguas; do \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done done
if test "$(PACKAGE)" = "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
fi
check: all $(GETTEXT_PACKAGE).pot check: all $(GETTEXT_PACKAGE).pot
dvi info tags TAGS ID:
mostlyclean: mostlyclean:
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -fr *.o
rm -f .intltool-merge-cache rm -f .intltool-merge-cache
clean: mostlyclean clean: mostlyclean
distclean: clean distclean: clean
rm -f Makefile Makefile.in POTFILES stamp-it rm -f Makefile Makefile.in POTFILES
rm -f *.mo *.msg *.cat *.cat.m *.gmo rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
maintainer-clean: distclean maintainer-clean: distclean
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
rm -f Makefile.in.in rm -f Makefile.in.in
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: $(DISTFILES) dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \ dists="$(DISTFILES)"; \
extra_dists="$(EXTRA_DISTFILES)"; \ extra_dists="$(EXTRA_DISTFILES)"; \
for file in $$extra_dists; do \ for file in $$extra_dists; do \
test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ test -f $$file && dists="$$dists $$file"; \
done; \ done; \
for file in $$dists; do \ for file in $$dists; do \
test -f $$file || file="$(srcdir)/$$file"; \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
ln $$file $(distdir) 2> /dev/null \ || cp -p $(srcdir)/$$file $(distdir); \
|| cp -p $$file $(distdir); \
done done
update-po: Makefile update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \ tmpdir=`pwd`; \
if test -n "$(PO_LINGUAS)"; then \ catalogs='$(CATALOGS)'; \
linguas="$(PO_LINGUAS)"; \ for cat in $$catalogs; do \
else \ cat=`basename $$cat`; \
linguas="$(ALL_LINGUAS)"; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
fi; \
for lang in $$linguas; do \
echo "$$lang:"; \ echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if $$result; then \ if $$result; then \
...@@ -200,20 +234,28 @@ update-po: Makefile ...@@ -200,20 +234,28 @@ update-po: Makefile
fi; \ fi; \
fi; \ fi; \
else \ else \
echo "msgmerge for $$lang.gmo failed!"; \ echo "msgmerge for $$cat failed!"; \
rm -f $$tmpdir/$$lang.new.po; \ rm -f $$tmpdir/$$lang.new.po; \
fi; \ fi; \
done done
Makefile POTFILES: stamp-it # POTFILES is created from POTFILES.in by stripping comments, empty lines
@if test ! -f $@; then \ # and Intltool tags (enclosed in square brackets), and appending a full
rm -f stamp-it; \ # relative path to them
$(MAKE) stamp-it; \ POTFILES: POTFILES.in
fi ( posrcprefix='$(top_srcdir)/'; \
rm -f $@-t $@ \
stamp-it: Makefile.in.in ../config.status POTFILES.in && (sed -e '/^#/d' \
-e 's/^[[].*] *//' \
-e '/^[ ]*$$/d' \
-e "s@^@ $$posrcprefix@" $(srcdir)/$@.in \
| sed -e '$$!s/$$/ \\/') > $@-t \
&& chmod a-w $@-t \
&& mv $@-t $@ )
Makefile: Makefile.in.in ../config.status POTFILES
cd .. \ cd .. \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
$(SHELL) ./config.status $(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables. # Tell versions [3.59,3.63) of GNU make not to export all variables.
......
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