better makefiles

git-archimport-id: opensource@polytechnique.org--2005/banana--mainline--1.0--patch-7

diff --git a/Makefile b/Makefile
index b12a8ce..af7b7ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ dist: clean pkg-dist
 
 clean:
        rm -rf locale banana/include/banana.inc.php
+       make -C po clean
 
 %: %.in Makefile
        sed -e 's,@VERSION@,$(VERSION),g' $< > $@

diff --git a/po/Makefile b/po/Makefile
index 8a9269a..00fc268 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,11 +3,7 @@
 # $Horde: horde/po/Makefile,v 1.2.2.3 2002/05/20 17:36:22 jan Exp $
 #
 
-MSGFMT = msgfmt --statistics -c -v -o
-MSGFMTSOL = msgfmt -v -o
-MSGMERGE = msgmerge -U
 LANGS:=$(shell ls *.po|sed -e s/\.po$$//)
-APPLICATION = banana
 
 all: banana.pot ${LANGS:=.lang}
 
@@ -22,8 +18,10 @@ banana.pot: ../banana/*.php
 %.lang: banana.pot ../banana/*.php %.po
        @echo Generating $(@:.lang=)
        @echo -n '    '
-       @${MSGMERGE} $(@:.lang=) $< 2> /dev/null
-       @${MSGFMT} ../locale/$(@:.lang=)/LC_MESSAGES/banana.mo $(@:.lang=)
+       @mkdir -p ../locale/$(@:.lang=)/LC_MESSAGES/ 
+       @msgmerge -U $(@:.lang=).po $< 2> /dev/null
+       @msgfmt --statistics -c -v -o ../locale/$(@:.lang=)/LC_MESSAGES/banana.mo $(@:.lang=).po
        @echo
        @touch $@
 
+

diff --git a/po/banana.pot b/po/banana.pot
index af7e9c6..36862c0 100644 (file)
--- a/po/banana.pot
+++ b/po/banana.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-07 20:09+0100\n"
+"POT-Creation-Date: 2005-01-07 20:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"