[mgt-commits] r6 - in /trunk: Makefile.am configure.in po/Makefile.in.in
msameer at users.alioth.debian.org
msameer at users.alioth.debian.org
Sat Feb 16 16:20:22 UTC 2008
Author: msameer
Date: Sat Feb 16 16:20:22 2008
New Revision: 6
URL: http://svn.debian.org/wsvn/multignometerm/?sc=3D1&rev=3D6
Log:
configure.in: stripped almost everything. Just trying to generate a file th=
at'd check for gtk2 only and some of the needed libraries.
Makefile.am: removed intl
po/Makefile.in.in: updated using glib-gettextize
Modified:
trunk/Makefile.am
trunk/configure.in
trunk/po/Makefile.in.in
Modified: trunk/Makefile.am
URL: http://svn.debian.org/wsvn/multignometerm/trunk/Makefile.am?rev=3D6&op=
=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Sat Feb 16 16:20:22 2008
@@ -3,8 +3,7 @@
gnome-terminal\
idl\
omf-install\
- po \
- intl
+ po
=
infodir =3D $(datadir)/gnome/help/multi-gnome-terminal/C
info_DATA =3D ChangeLog NEWS
Modified: trunk/configure.in
URL: http://svn.debian.org/wsvn/multignometerm/trunk/configure.in?rev=3D6&o=
p=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/configure.in (original)
+++ trunk/configure.in Sat Feb 16 16:20:22 2008
@@ -1,94 +1,34 @@
AC_INIT(gnome-terminal)
-
-dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
-dnl
-dnl If you add a version number here, you *must* add an AC_SUBST line for
-dnl it too, or it will never make it into the spec file!
-dnl
-dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
-
-GTK_REQUIRED=3D1.2.5
-GDK_PIXBUF_REQUIRED=3D0.7.0
-LIBGLADE_REQUIRED=3D0.14
-GNOME_LIBS_REQUIRED=3D1.0.59
-ORBIT_REQUIRED=3D0.5.0
-#CONTROL_CENTER_REQUIRED=3D1.4.0
-
-# AM_CONFIG_HEADER(config.h)
AM_CONFIG_HEADER(config.h)
-PACKAGE=3Dmulti-gnome-terminal
-VERSION=3D1.6.2
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION) =
+AM_INIT_AUTOMAKE(multi-gnome-terminal, 1.6.2)
=
AM_MAINTAINER_MODE
=
-AM_ACLOCAL_INCLUDE(macros)
-
-dnl AM_PROG_XML_I18N_TOOLS
AC_PROG_INTLTOOL([0.12])
-
-dnl
-dnl let applications configure for gnome
-dnl
-gnome_cv_use_gnome=3Dyes
-
-GNOME_INIT
=
AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS
-AC_ARG_PROGRAM
+dnl AC_ARG_PROGRAM
AM_PROG_LIBTOOL
AM_PROG_LEX
AC_PROG_YACC
AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
=
-GNOME_COMPILE_WARNINGS
-
-GNOME_X_CHECKS
-GNOME_XML_CHECK
-
-AM_PATH_GTK($GTK_REQUIRED, ,[
-AC_MSG_ERROR(Please upgrade your GTK+)])
-
-AC_SUBST(GTK_REQUIRED)
+PKG_CHECK_MODULES(KATOOB, gtk+-2.0 >=3D 2.0.0)
=
dnl Set a default install dir if none exists.
test "x$prefix" =3D xNONE && prefix=3D$ac_default_prefix
=
echo -n $VERSION > version
=
-dnl Check for new enough gnome-libs
-CFLAGS_save=3D$CFLAGS
-LIBS_save=3D$LIBS
-CFLAGS=3D`gnome-config --cflags gnomeui`
-LIBS=3D`gnome-config --libs gnomeui`
-
-AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[
-AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)])
-
-AC_SUBST(GNOME_LIBS_REQUIRED)
-
-CFLAGS=3D$CFLAGS_save
-LIBS=3D$LIBS_save
-
-dnl utility conditional
-dnl AM_CONDITIONAL(FALSE, test "x" =3D "y")
-
ALL_LINGUAS=3D""
dnl ALL_LINGUAS=3D"az bg ca cs da de el en_GB es et eu fi fr ga gl hu it j=
a ko lt lv nl nn no pl pt pt_BR ro ru sk sl sp sr sv ta tr uk wa zh_TW.Big5=
zh_CN.GB2312"
-AM_GNOME_GETTEXT
-# AM_GNOME_GETTEXT above substs $DATADIRNAME
-# this is the directory where the *.{mo,gmo} files are installed
-gnomelocaledir=3D'${prefix}/share/locale'
-AC_SUBST(gnomelocaledir)
-
-AC_DEFINE_UNQUOTED(GNOMEDATADIR,"${prefix}")
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(GNOMESBINDIR)
+
+GETTEXT_PACKAGE=3Dmulti-gnome-terminal
+AM_GLIB_GNU_GETTEXT
+
+AC_DEFINE_UNQUOTED(GNOMEDATADIR,"${prefix}", [our prefix.])
=
AC_CHECK_HEADERS(dlfcn.h dl.h syslog.h tcpd.h)
AC_CHECK_LIB(dl, dlopen, DL_LIB=3D"-ldl",[
@@ -99,6 +39,12 @@
])])
AC_SUBST(DL_LIB)
=
+AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(GNOMESBINDIR)
+
for dir in `(IFS=3D:; for i in $PATH; do echo $i ; done)` ; do
if test -f $dir/orbit-idl ; then
orbit_prefix=3D`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
@@ -106,52 +52,6 @@
fi
done
=
-ORB_LIBS=3D"$ORBIT_LIBS"
-ORB_CFLAGS=3D"$ORBIT_CFLAGS `orbit-config --cflags client server`"
-
-AC_SUBST(ORB_LIBS)
-AC_SUBST(ORB_CFLAGS)
-AC_SUBST(ORBIT_REQUIRED)
-
-dnl
-dnl Configure Easter Egg
-dnl
-AC_MSG_CHECKING(for Configure Easter Egg version >=3D 3.14)
-AC_MSG_RESULT(found)
-
-dnl
-dnl GdkPixBuf
-dnl
-AC_MSG_CHECKING(for GdkPixbuf library >=3D $GDK_PIXBUF_REQUIRED)
-PIXBUF_CFLAGS=3D`$GNOME_CONFIG --cflags gdk_pixbuf`
-PIXBUF_LIBS=3D`$GNOME_CONFIG --libs gdk_pixbuf`
-if test "x$PIXBUF_CFLAGS" !=3D x ; then
- vers=3D`gdk-pixbuf-config --version | awk 'BEGIN { FS =3D "."; } { pri=
ntf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test "$vers" -ge 0007000; then
- AC_MSG_RESULT(found)
- else
- AC_MSG_ERROR(You need at least GdkPixbuf version 0.7.0 for the pane=
l)
- fi
-else
- AC_MSG_ERROR(Did not find GdkPixbuf installed)
-fi
-AC_SUBST(PIXBUF_CFLAGS)
-AC_SUBST(PIXBUF_LIBS)
-AC_SUBST(GDK_PIXBUF_REQUIRED)
-
-dnl
-dnl GnomeCanvasPixbuf
-dnl
-CANVAS_PIXBUF_CFLAGS=3D`$GNOME_CONFIG --cflags gnomecanvaspixbuf`
-CANVAS_PIXBUF_LIBS=3D`$GNOME_CONFIG --libs gnomecanvaspixbuf`
-AC_SUBST(CANVAS_PIXBUF_CFLAGS)
-AC_SUBST(CANVAS_PIXBUF_LIBS)
-if test "x$CANVAS_PIXBUF_CFLAGS" =3D x ; then
- AC_MSG_ERROR(GnomeCanvasPixbuf is required for gnome-about.
-This is contained in the gdk-pixbuf module, however, make sure to build
-this module after you build gnome-libs)
-fi
-
dnl
dnl Gnome Terminal
dnl
@@ -160,43 +60,43 @@
AC_SUBST(ZVT_LIBS)
=
dnl Gnome Terminal now requires LibGlade
-AC_MSG_CHECKING(for Glade libraries >=3D $LIBGLADE_REQUIRED)
-libglade_ok=3Dno
-if gnome-config --libs libglade > /dev/null 2>&1; then =
- verstxt=3D`gnome-config --modversion libglade`
- vers=3D`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 1000 + $2;}'`
- if test "$vers" -ge 14; then
- AC_MSG_RESULT($marker_ok found $verstxt)
- libglade_ok=3Dyes
- else
- AC_MSG_RESULT($marker_fail found only $verstxt)
- fi
-else
- AC_MSG_RESULT($marker_fail not found)
-fi
-if test "$libglade_ok" =3D no; then
- AC_MSG_ERROR(You need at least libglade 0.14 for this version of gnome=
-core)
-fi
-unset libglade_ok
-GT_LIBS=3D"libglade gnorba gnomeui"
-dnl zvt
-GNOME_TERMINAL_LIBS=3D`gnome-config --libs $GT_LIBS`
-GNOME_TERMINAL_CFLAGS=3D`gnome-config --cflags $GT_LIBS`
-AC_SUBST(GNOME_TERMINAL_LIBS)
-AC_SUBST(GNOME_TERMINAL_CFLAGS)
-AC_SUBST(LIBGLADE_REQUIRED)
-
-dnl
-dnl Check for zvt_term_reset and del_is_del
-dnl
-oLIBS=3D"$LIBS"
-LIBS=3D"$GNOMEUI_LIBS $GNOME_LIBDIR"
-dnl $ZVT_LIBS"
-AC_CHECK_FUNC(zvt_term_reset,[AC_DEFINE(HAVE_ZVT_TERM_RESET)])
-AC_CHECK_FUNC(zvt_term_set_del_is_del,[AC_DEFINE(HAVE_ZVT_DEL_IS_DEL)])
-LIBS=3D"$oLIBS"
-AC_DEFINE(HAVE_ZVT_TERM_RESET)
-AC_DEFINE(HAVE_ZVT_DEL_IS_DEL)
+dnl AC_MSG_CHECKING(for Glade libraries >=3D $LIBGLADE_REQUIRED)
+dnl libglade_ok=3Dno
+dnl if gnome-config --libs libglade > /dev/null 2>&1; then =
+dnl verstxt=3D`gnome-config --modversion libglade`
+dnl vers=3D`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 1000 + $2;}=
'`
+dnl if test "$vers" -ge 14; then
+dnl AC_MSG_RESULT($marker_ok found $verstxt)
+dnl libglade_ok=3Dyes
+dnl else
+dnl AC_MSG_RESULT($marker_fail found only $verstxt)
+dnl fi
+dnl else
+dnl AC_MSG_RESULT($marker_fail not found)
+dnl fi
+dnl if test "$libglade_ok" =3D no; then
+dnl AC_MSG_ERROR(You need at least libglade 0.14 for this version of g=
nome-core)
+dnl fi
+dnl unset libglade_ok
+dnl GT_LIBS=3D"libglade gnorba gnomeui"
+dnl dnl zvt
+dnl GNOME_TERMINAL_LIBS=3D`gnome-config --libs $GT_LIBS`
+dnl GNOME_TERMINAL_CFLAGS=3D`gnome-config --cflags $GT_LIBS`
+dnl AC_SUBST(GNOME_TERMINAL_LIBS)
+dnl AC_SUBST(GNOME_TERMINAL_CFLAGS)
+dnl AC_SUBST(LIBGLADE_REQUIRED)
+
+dnl dnl
+dnl dnl Check for zvt_term_reset and del_is_del
+dnl dnl
+dnl oLIBS=3D"$LIBS"
+dnl LIBS=3D"$GNOMEUI_LIBS $GNOME_LIBDIR"
+dnl dnl $ZVT_LIBS"
+dnl AC_CHECK_FUNC(zvt_term_reset,[AC_DEFINE(HAVE_ZVT_TERM_RESET)])
+dnl AC_CHECK_FUNC(zvt_term_set_del_is_del,[AC_DEFINE(HAVE_ZVT_DEL_IS_DEL)])
+dnl LIBS=3D"$oLIBS"
+dnl AC_DEFINE(HAVE_ZVT_TERM_RESET)
+dnl AC_DEFINE(HAVE_ZVT_DEL_IS_DEL)
=
dnl
dnl Check for libbz2
@@ -204,12 +104,12 @@
oLIBS=3D"$LIBS"
BZ_LIBS=3D""
AC_CHECK_LIB(bz2, bzopen, [
- AC_DEFINE(HAVE_LIBBZ2)
+ AC_DEFINE(HAVE_LIBBZ2, 1, [whether we have libbz2 or not])
LIBS=3D$oLIBS
BZ_LIBS=3D"-lbz2"
], AC_CHECK_LIB(bz2, BZ2_bzopen, [
- AC_DEFINE(HAVE_LIBBZ2)
- AC_DEFINE(HAVE_LIBBZ2_1_0)
+ AC_DEFINE(HAVE_LIBBZ2, 1, [whether we have libbz2 or not])
+ AC_DEFINE(HAVE_LIBBZ2_1_0, 1, [we have libbz 1.0])
LIBS=3D$oLIBS
BZ_LIBS=3D"-lbz2"
], AC_MSG_WARN([Recent enough BZ2 library not found. Help-Browser will=
not be able to read bzipped man/info pages])
@@ -258,7 +158,7 @@
hdr.msg_controllen =3D 0;
sendmsg (0, &hdr, 0);
],[
-AC_DEFINE(HAVE_SENDMSG)
+AC_DEFINE(HAVE_SENDMSG, 1, [Unix98 has sendmsg])
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
=
AC_CHECK_UTMP
@@ -268,9 +168,9 @@
=
AC_CHECK_LIB(util, openpty,
[
- AC_CHECK_LIB(util, login_tty, [AC_DEFINE(HAVE_LOGIN_TTY)])
- AC_DEFINE(HAVE_OPENPTY)
- AC_DEFINE(HAVE_LIBUTIL)
+ AC_CHECK_LIB(util, login_tty, [AC_DEFINE(HAVE_LOGIN_TTY, 1, [libutil h=
as login_tty])])
+ AC_DEFINE(HAVE_OPENPTY, 1, [we have openpty])
+ AC_DEFINE(HAVE_LIBUTIL, 1, [using libutil])
UTIL_LIBS=3D"-lutil"
AC_SUBST(UTIL_LIBS)
])
@@ -303,7 +203,7 @@
dnl
uname_s=3D`uname -s`
if test "x$uname_s" =3D xSunOS; then
- AC_DEFINE(DO_LIBICE_CHECK)
+ AC_DEFINE(DO_LIBICE_CHECK, 1, [libICE on solaris])
fi
=
dnl uname_s=3D`uname -s`
@@ -317,7 +217,7 @@
=
dnl HACK to expand datadir
ICONDIR=3D`eval echo "${datadir}/pixmaps/mgt"`
-AC_DEFINE_UNQUOTED(GNOME_ICONDIR,"${ICONDIR}")
+AC_DEFINE_UNQUOTED(GNOME_ICONDIR,"${ICONDIR}", [location of our icons.])
=
=
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -390,5 +290,4 @@
pixmaps/Makefile
omf-install/Makefile
po/Makefile.in
-intl/Makefile
gnome-terminal/multi-gnome-terminal.dsl])
Modified: trunk/po/Makefile.in.in
URL: http://svn.debian.org/wsvn/multignometerm/trunk/po/Makefile.in.in?rev=
=3D6&op=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/po/Makefile.in.in (original)
+++ trunk/po/Makefile.in.in Sat Feb 16 16:20:22 2008
@@ -1,17 +1,20 @@
# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper at gnu.ai.mi=
t.edu>
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
#
# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public=
License
+# be used in projects which are not available under the GNU Public License
# but which still want to provide support for the GNU gettext functionalit=
y.
# Please note that the actual code is *not* freely available.
-
+#
+# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob at ximian.com> to install
+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+
+GETTEXT_PACKAGE =3D @GETTEXT_PACKAGE@
PACKAGE =3D @PACKAGE@
VERSION =3D @VERSION@
-
-# These two variables depend on the location of this directory.
-subdir =3D po
-top_builddir =3D ..
=
SHELL =3D /bin/sh
@SET_MAKE@
@@ -22,25 +25,25 @@
=
prefix =3D @prefix@
exec_prefix =3D @exec_prefix@
+datarootdir =3D @datarootdir@
datadir =3D @datadir@
-localedir =3D $(datadir)/locale
-gettextsrcdir =3D $(datadir)/gettext/po
+libdir =3D @libdir@
+localedir =3D $(libdir)/locale
+gnulocaledir =3D $(datadir)/locale
+gettextsrcdir =3D $(datadir)/glib-2.0/gettext/po
+subdir =3D po
=
INSTALL =3D @INSTALL@
INSTALL_DATA =3D @INSTALL_DATA@
-MKINSTALLDIRS =3D @MKINSTALLDIRS@
-mkinstalldirs =3D $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTA=
LLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+MKINSTALLDIRS =3D $(top_srcdir)/@MKINSTALLDIRS@
=
CC =3D @CC@
+GENCAT =3D @GENCAT@
GMSGFMT =3D @GMSGFMT@
MSGFMT =3D @MSGFMT@
+MSGFMT_OPTS =3D @MSGFMT_OPTS@
XGETTEXT =3D @XGETTEXT@
-INTLTOOL_UPDATE =3D @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
-
-MSGMERGE =3D INTLTOOL_EXTRACT=3D$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --d=
ist
-GENPOT =3D INTLTOOL_EXTRACT=3D$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --p=
ot
-
+MSGMERGE =3D msgmerge
=
DEFS =3D @DEFS@
CFLAGS =3D @CFLAGS@
@@ -50,31 +53,38 @@
=
COMPILE =3D $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
=
+SOURCES =3D =
POFILES =3D @POFILES@
GMOFILES =3D @GMOFILES@
-DISTFILES =3D ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-$(POFILES) $(GMOFILES)
+DISTFILES =3D ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
+$(POFILES) $(GMOFILES) $(SOURCES)
=
POTFILES =3D \
=
CATALOGS =3D @CATALOGS@
+CATOBJEXT =3D @CATOBJEXT@
+INSTOBJEXT =3D @INSTOBJEXT@
=
.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
=
.c.o:
$(COMPILE) $<
=
.po.pox:
- $(MAKE) $(PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
=
.po.mo:
$(MSGFMT) -o $@ $<
=
.po.gmo:
file=3D$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
+ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
+
+.po.cat:
+ sed -f ../intl/po2msg.sed < $< > $*.msg \
+ && rm -f $@ && $(GENCAT) $@ $*.msg
=
=
all: all- at USE_NLS@
@@ -82,42 +92,86 @@
all-yes: $(CATALOGS)
all-no:
=
-# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
- $(GENPOT)
-
+$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+ $(XGETTEXT) --default-domain=3D$(GETTEXT_PACKAGE) --directory=3D$(top_src=
dir) \
+ --add-comments --keyword=3D_ --keyword=3DN_ \
+ --flag=3Dg_strdup_printf:1:c-format \
+ --flag=3Dg_string_printf:2:c-format \
+ --flag=3Dg_string_append_printf:2:c-format \
+ --flag=3Dg_error_new:3:c-format \
+ --flag=3Dg_set_error:4:c-format \
+ --flag=3Dg_markup_printf_escaped:1:c-format \
+ --flag=3Dg_log:3:c-format \
+ --flag=3Dg_print:1:c-format \
+ --flag=3Dg_printerr:1:c-format \
+ --flag=3Dg_printf:1:c-format \
+ --flag=3Dg_fprintf:2:c-format \
+ --flag=3Dg_sprintf:2:c-format \
+ --flag=3Dg_snprintf:3:c-format \
+ --flag=3Dg_scanner_error:2:c-format \
+ --flag=3Dg_scanner_warn:2:c-format \
+ --files-from=3D$(srcdir)/POTFILES.in \
+ && test ! -f $(GETTEXT_PACKAGE).po \
+ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
+ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
=
install: install-exec install-data
install-exec:
install-data: install-data- at USE_NLS@
- if test "$(PACKAGE)" =3D "gettext"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+install-data-no: all
+install-data-yes: all
+ if test -r "$(MKINSTALLDIRS)"; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ fi
+ @catalogs=3D'$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=3D`basename $$cat`; \
+ case "$$cat" in \
+ *.gmo) destdir=3D$(gnulocaledir);; \
+ *) destdir=3D$(localedir);; \
+ esac; \
+ lang=3D`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ dir=3D$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+ if test -r "$(MKINSTALLDIRS)"; then \
+ $(MKINSTALLDIRS) $$dir; \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+ fi; \
+ if test -r $$cat; then \
+ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ 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"; \
+ else \
+ true; \
+ fi; \
+ fi; \
+ done
+ if test "$(PACKAGE)" =3D "glib"; then \
+ if test -r "$(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
-install-data-no: all
-install-data-yes: all
- $(mkinstalldirs) $(DESTDIR)$(datadir)
- @catalogs=3D'$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=3D`basename $$cat`; \
- lang=3D`echo $$cat | sed 's/\.gmo$$//'`; \
- dir=3D$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
- echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
- echo "installing $(srcdir)/$$cat as" \
- "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
- fi; \
- done
=
# Define this as empty until I found a useful application.
installcheck:
@@ -126,13 +180,14 @@
catalogs=3D'$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=3D`basename $$cat`; \
- lang=3D`echo $$cat | sed 's/\.gmo$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
- done
- if test "$(PACKAGE)" =3D "gettext"; then \
+ lang=3D`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INS=
TOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INS=
TOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(=
INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(=
INSTOBJEXT).m; \
+ done
+ if test "$(PACKAGE)" =3D "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
fi
=
check: all
@@ -140,68 +195,74 @@
dvi info tags TAGS ID:
=
mostlyclean:
- rm -f core core.* *.pox $(PACKAGE).po *.new.po
+ rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
rm -fr *.o
=
clean: mostlyclean
=
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo
+ rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
=
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
rm -f $(GMOFILES)
=
-distdir =3D $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
- $(MAKE) update-po
- @$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+distdir =3D ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: update-po $(DISTFILES)
dists=3D"$(DISTFILES)"; \
for file in $$dists; do \
- if test -f $$file; then dir=3D.; else dir=3D$(srcdir); fi; \
- cp -p $$dir/$$file $(distdir); \
+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+ || cp -p $(srcdir)/$$file $(distdir); \
done
=
update-po: Makefile
- $(MAKE) $(PACKAGE).pot
- if test "$(PACKAGE)" =3D "gettext"; then PATH=3D`pwd`/../src:$$PATH; fi; \
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ tmpdir=3D`pwd`; \
cd $(srcdir); \
- catalogs=3D'$(GMOFILES)'; \
+ catalogs=3D'$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=3D`basename $$cat`; \
- lang=3D`echo $$cat | sed 's/\.gmo$$//'`; \
- cp $$lang.po $$lang.old.po; \
+ lang=3D`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
echo "$$lang:"; \
- if $(MSGMERGE) $$lang ; then \
- rm -f $$lang.old.po; \
+ if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.=
po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.=
new.po to $$lang.po" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ exit 1; \
+ fi; \
+ fi; \
else \
echo "msgmerge for $$cat failed!"; \
- mv $$lang.old.po $$lang.po; \
- fi; \
- done
- $(MAKE) update-gmo
-
-.po: Makefile
- $(MAKE) $(PACKAGE).pot;
- PATH=3D`pwd`/../src:$$PATH; \
- echo; printf "$*: "; \
- if $(MSGMERGE) $*; then \
- rm -f $*.old.po; \
- else \
- echo "msgmerge for * failed!"; \
- mv $*.old.po $*.po; \
- fi; \
- msgfmt --statistics $*.po; echo;
-
-
-update-gmo: Makefile $(GMOFILES)
- @:
-
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
- cd $(top_builddir) \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi; \
+ done
+
+# POTFILES is created from POTFILES.in by stripping comments, empty lines
+# and Intltool tags (enclosed in square brackets), and appending a full
+# relative path to them
+POTFILES: POTFILES.in
+ ( if test 'x$(srcdir)' !=3D 'x.'; then \
+ posrcprefix=3D'$(top_srcdir)/'; \
+ else \
+ posrcprefix=3D"../"; \
+ fi; \
+ rm -f $@-t $@ \
+ && (sed -e '/^#/d' \
+ -e "s/^\[.*\] +//" \
+ -e '/^[ ]*$$/d' \
+ -e "s at .*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+ | sed -e '$$s/\\$$//') > $@-t \
+ && chmod a-w $@-t \
+ && mv $@-t $@ )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+ cd .. \
&& CONFIG_FILES=3D$(subdir)/$@.in CONFIG_HEADERS=3D \
$(SHELL) ./config.status
=
More information about the multignometerm-commits
mailing list