callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HACKING Makefile.am acconfig.h autogen.sh use AM_GLIB_GNU_GETTEXT. Since

Browse Source 
2001-09-27  Sven Neumann  <sven@gimp.org>

        * HACKING
        * Makefile.am
        * acconfig.h
        * autogen.sh
        * configure.in: use AM_GLIB_GNU_GETTEXT. Since glib and GTK+ rely on
        gettext being available, we don't need to ship with the option to use
        an included implementation. The intl subdirectory will not be created
        anymore. Had to put the old sed hacks back in that create Makefiles
        from Makefile.in in the extra po directories.

        * almost all Makefile.am: removed $(top_srcdir)/intl from INCLUDES.

        * app/main.c
        * libgimp/stdplugins-intl.h
        * plug-ins/perl/Gimp.xs
        * plug-ins/script-fu/script-fu-intl.h: changed package names to
        gimp14* so the po files don't clash with gimp12.
This commit is contained in:
Sven Neumann
2001-09-27 15:33:53 +00:00
committed by Sven Neumann
parent 6820c7997e
commit a56949222f
46 changed files with 81 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2001-09-27 Sven Neumann <sven@gimp.org>
* HACKING
* Makefile.am
* acconfig.h
* autogen.sh
* configure.in: use AM_GLIB_GNU_GETTEXT. Since glib and GTK+ rely on
gettext being available, we don't need to ship with the option to use
an included implementation. The intl subdirectory will not be created
anymore. Had to put the old sed hacks back in that create Makefiles
from Makefile.in in the extra po directories.
* almost all Makefile.am: removed $(top_srcdir)/intl from INCLUDES.
* app/main.c
* libgimp/stdplugins-intl.h
* plug-ins/perl/Gimp.xs
* plug-ins/script-fu/script-fu-intl.h: changed package names to
gimp14* so the po files don't clash with gimp12.
2001-09-26 Manish Singh <yosh@gimp.org> 2001-09-26 Manish Singh <yosh@gimp.org>
* app/gui/preferences-dialog.c: replaced CTree with a TreeView * app/gui/preferences-dialog.c: replaced CTree with a TreeView

4
HACKING
View File

@ -6,13 +6,11 @@ to have the following packages (or newer versions) installed:
- GNU autoconf 2.13 - GNU autoconf 2.13
- GNU automake 1.4 - GNU automake 1.4
- GNU libtool 1.3.4 - GNU libtool 1.3.4
- GNU gettext 10.38
Available in ftp://alpha.gnu.org/gnu
These should be available by ftp from prep.ai.mit.edu or any of the These should be available by ftp from prep.ai.mit.edu or any of the
fine GNU mirrors. Beta software can be found at alpha.gnu.org. fine GNU mirrors. Beta software can be found at alpha.gnu.org.
- pkg-config 0.7.0 or better - pkg-config 0.7.0 (or a newer version)
Available from http://www.freedesktop.org/software/pkgconfig Available from http://www.freedesktop.org/software/pkgconfig

1
Makefile.am
View File

@ -3,7 +3,6 @@
SUBDIRS = \ SUBDIRS = \
m4macros \ m4macros \
tools \ tools \
intl \
regexrepl \ regexrepl \
pixmaps \ pixmaps \
themes \ themes \

3
acconfig.h
View File

@ -52,6 +52,9 @@
#undef SRAND_FUNC #undef SRAND_FUNC
#undef USE_PTHREADS #undef USE_PTHREADS
#undef GETTEXT_PACKAGE
/* Leave that blank line there!! Autoheader needs it. /* Leave that blank line there!! Autoheader needs it.
If you're adding to this file, keep in mind: If you're adding to this file, keep in mind:

1
app/Makefile.am
View File

@ -121,7 +121,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

2
app/main.c
View File

@ -119,7 +119,7 @@ main (int argc,
prog_name = argv[0]; prog_name = argv[0];
/* Initialize i18n support */ /* Initialize i18n support */
INIT_LOCALE ("gimp"); INIT_LOCALE (GETTEXT_PACKAGE);
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
bindtextdomain ("gimp-libgimp", LOCALEDIR); bindtextdomain ("gimp-libgimp", LOCALEDIR);

23
autogen.sh
View File

@ -36,9 +36,9 @@ DIE=0
DIE=1 DIE=1
} }
echo "I am testing that you have the required versions of libtool, autoconf," echo "I am testing that you have the required versions of libtool, autoconf"
echo "automake and gettext. This test is not foolproof, so if anything goes" echo "and automake. This test is not foolproof, so if anything goes wrong,"
echo "wrong, see the file HACKING for more information..." echo "see the file HACKING for more information..."
echo echo
echo "Testing libtool... " echo "Testing libtool... "
@ -68,15 +68,6 @@ else
DIE=1 DIE=1
fi fi
echo "Testing gettextize... "
VER=`gettextize --version | grep gettext | sed "s/.* \([0-9.]*\)[a-z]*$/\1/;s/0.//"`
if expr $VER \>= 10.38 >/dev/null; then
echo "looks OK."
else
echo "too old! (Need (0.)10.38, have $VER)"
DIE=1
fi
echo echo
if test "$DIE" -eq 1; then if test "$DIE" -eq 1; then
@ -100,7 +91,7 @@ esac
if test -z "$ACLOCAL_FLAGS"; then if test -z "$ACLOCAL_FLAGS"; then
acdir=`aclocal --print-ac-dir` acdir=`aclocal --print-ac-dir`
m4list="gtk.m4 gettext.m4" m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4"
for file in $m4list for file in $m4list
do do
@ -116,12 +107,6 @@ if test -z "$ACLOCAL_FLAGS"; then
done done
fi fi
echo "Running gettextize... Ignore non-fatal messages."
# Hmm, we specify --force here, since otherwise things dont'
# get added reliably, but we don't want to overwrite intl
# while making dist.
echo "no" | gettextize --copy --force
aclocal $ACLOCAL_FLAGS aclocal $ACLOCAL_FLAGS
# optionally feature autoheader # optionally feature autoheader

20
configure.in
View File

@ -26,6 +26,10 @@ LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
VERSION=$GIMP_VERSION VERSION=$GIMP_VERSION
PACKAGE=gimp PACKAGE=gimp
GETTEXT_PACKAGE=gimp14
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
dnl Specify a configuration file dnl Specify a configuration file
@ -97,8 +101,7 @@ AC_SUBST(STRIP_END)
dnl i18n stuff dnl i18n stuff
ALL_LINGUAS="ca cs da de en_GB es fi fr ga gl hu hr it ja ko nl no pl pt_BR ro ru sk sv tr uk zh_TW.Big5" ALL_LINGUAS="ca cs da de en_GB es fi fr ga gl hu hr it ja ko nl no pl pt_BR ro ru sk sv tr uk zh_TW.Big5"
AM_GLIB_GNU_GETTEXT
AM_GNU_GETTEXT
AC_PATH_XTRA AC_PATH_XTRA
@ -823,7 +826,6 @@ gimp.spec
Makefile Makefile
build/Makefile build/Makefile
build/win32/Makefile build/win32/Makefile
intl/Makefile
tools/Makefile tools/Makefile
tools/authorsgen/Makefile tools/authorsgen/Makefile
tools/pdbgen/Makefile tools/pdbgen/Makefile
@ -924,10 +926,16 @@ po/Makefile.in
po-libgimp/Makefile.in po-libgimp/Makefile.in
po-plug-ins/Makefile.in po-plug-ins/Makefile.in
po-script-fu/Makefile.in po-script-fu/Makefile.in
plug-ins/perl/po/Makefile.in], plug-ins/perl/po/Makefile.in
[ ],[
chmod +x gimptool-1.4 chmod +x gimptool-1.4
sed -e "s/^ ..\/..\/..\// ..\//" plug-ins/perl/po/Makefile > plug-ins/perl/po/Makefile.eek && mv plug-ins/perl/po/Makefile.eek plug-ins/perl/po/Makefile
sed -e "/POTFILES =/r po-libgimp/POTFILES" po-libgimp/Makefile.in > po-libgimp/Makefile
sed -e "/POTFILES =/r po-plug-ins/POTFILES" po-plug-ins/Makefile.in > po-plug-ins/Makefile
sed -e "/POTFILES =/r po-script-fu/POTFILES" po-script-fu/Makefile.in > po-script-fu/Makefile
sed -e "/POTFILES =/r plug-ins/perl/po/POTFILES" plug-ins/perl/po/Makefile.in > plug-ins/perl/po/Makefile
case "$CONFIG_FILES" in case "$CONFIG_FILES" in
*plug-ins/perl*) *plug-ins/perl*)
if test -f plug-ins/perl/config.status; then if test -f plug-ins/perl/config.status; then

2
libgimp/Makefile.am
View File

@ -12,8 +12,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I../intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

14
libgimp/stdplugins-intl.h
View File

@ -25,13 +25,13 @@
#include "gimpintl.h" #include "gimpintl.h"
#define INIT_I18N() G_STMT_START{ \ #define INIT_I18N() G_STMT_START{ \
bindtextdomain("gimp-libgimp", LOCALEDIR); \ bindtextdomain(GETTEXT_PACKAGE"-libgimp", LOCALEDIR); \
bind_textdomain_codeset ("gimp-libgimp", "UTF-8"); \ bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8"); \
bindtextdomain("gimp-std-plugins", LOCALEDIR); \ bindtextdomain(GETTEXT_PACKAGE"-std-plugins", LOCALEDIR); \
bind_textdomain_codeset ("gimp-std-plugins", "UTF-8"); \ bind_textdomain_codeset (GETTEXT_PACKAGE"-std-plugins", "UTF-8"); \
textdomain("gimp-std-plugins"); \ textdomain(GETTEXT_PACKAGE"-std-plugins"); \
setlocale (LC_NUMERIC, "C"); \ setlocale (LC_NUMERIC, "C"); \
}G_STMT_END }G_STMT_END
#define INIT_I18N_UI() G_STMT_START{ \ #define INIT_I18N_UI() G_STMT_START{ \

2
libgimpbase/Makefile.am
View File

@ -12,8 +12,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I../intl \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

2
libgimpcolor/Makefile.am
View File

@ -12,8 +12,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I../intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

2
libgimpmath/Makefile.am
View File

@ -12,8 +12,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I../intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

2
libgimpwidgets/Makefile.am
View File

@ -12,8 +12,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I../intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/FractalExplorer/Makefile.am
View File

@ -24,7 +24,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/Lighting/Makefile.am
View File

@ -35,7 +35,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/plug-ins/libgck \ -I$(top_srcdir)/plug-ins/libgck \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \

1
plug-ins/MapObject/Makefile.am
View File

@ -37,7 +37,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/plug-ins/libgck \ -I$(top_srcdir)/plug-ins/libgck \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \

1
plug-ins/bmp/Makefile.am
View File

@ -17,7 +17,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/common/Makefile.am
View File

@ -15,7 +15,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/common/mkgen.pl
View File

@ -53,7 +53,6 @@ AM_CPPFLAGS = \@STRIP_BEGIN\@ \\
INCLUDES = \@STRIP_BEGIN\@ \\ INCLUDES = \@STRIP_BEGIN\@ \\
-I\$(top_srcdir) \\ -I\$(top_srcdir) \\
-I\$(top_srcdir)/intl \\
\$(GTK_CFLAGS) \\ \$(GTK_CFLAGS) \\
-I\$(includedir) \\ -I\$(includedir) \\
\@STRIP_END\@ \@STRIP_END\@

1
plug-ins/dbbrowser/Makefile.am
View File

@ -18,7 +18,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/faxg3/Makefile.am
View File

@ -17,7 +17,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/fits/Makefile.am
View File

@ -16,7 +16,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/flame/Makefile.am
View File

@ -21,7 +21,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/fp/Makefile.am
View File

@ -18,7 +18,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/gap/Makefile.am
View File

@ -212,7 +212,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/gdyntext/Makefile.am
View File

@ -53,7 +53,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/gfig/Makefile.am
View File

@ -19,7 +19,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/gflare/Makefile.am
View File

@ -16,7 +16,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/gfli/Makefile.am
View File

@ -16,7 +16,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/gimpressionist/Makefile.am
View File

@ -40,7 +40,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/helpbrowser/Makefile.am
View File

@ -18,7 +18,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(GTKXMHTML_CFLAGS) \ $(GTKXMHTML_CFLAGS) \
-I$(includedir) \ -I$(includedir) \

1
plug-ins/ifscompose/Makefile.am
View File

@ -19,7 +19,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/imagemap/Makefile.am
View File

@ -174,7 +174,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/maze/Makefile.am
View File

@ -18,7 +18,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/mosaic/Makefile.am
View File

@ -15,7 +15,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/pagecurl/Makefile.am
View File

@ -22,7 +22,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

4
plug-ins/perl/Gimp.xs
View File

@ -58,8 +58,8 @@ _exit()
BOOT: BOOT:
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
setlocale (LC_MESSAGES, ""); /* calling twice doesn't hurt, no? */ setlocale (LC_MESSAGES, ""); /* calling twice doesn't hurt, no? */
bindtextdomain ("gimp-perl", datadir "/locale"); bindtextdomain ("gimp14-perl", datadir "/locale");
textdomain ("gimp-perl"); textdomain ("gimp14-perl");
#endif #endif
char * char *

9
plug-ins/perl/po/ChangeLog
View File

@ -1,6 +1,13 @@
2001-09-27 Sven Neumann <sven@gimp.org>
* Makefile.in.in: different version for AM_GLIB_GNU_GETTEXT.
* Makefile.PL
* Makefile.in.in: changed package name to gimp14-perl.
2001-09-17 Andras Timar <timar@gnome.hu> 2001-09-17 Andras Timar <timar@gnome.hu>
* hu.po: converted to UTF-8. * hu.po: converted to UTF-8.
2001-08-29 Sven Neumann <sven@gimp.org> 2001-08-29 Sven Neumann <sven@gimp.org>

18
plug-ins/perl/po/Makefile.PL
View File

@ -9,9 +9,9 @@ if ($MSGFMT =~ /./ && $MSGFMT ne "no") {
my ($po) = /(.*)\.po$/; my ($po) = /(.*)\.po$/;
print " $po"; print " $po";
$install .= " @-\$(MKPATH) \$(datadir)/locale/$po/LC_MESSAGES\n". $install .= " @-\$(MKPATH) \$(datadir)/locale/$po/LC_MESSAGES\n".
" -\$(CP) $po.gmo \$(datadir)/locale/$po/LC_MESSAGES/gimp-perl.mo\n". " -\$(CP) $po.gmo \$(datadir)/locale/$po/LC_MESSAGES/gimp14-perl.mo\n".
" @-\$(CHMOD) 644 \$(datadir)/locale/$po/LC_MESSAGES/gimp-perl.mo\n"; " @-\$(CHMOD) 644 \$(datadir)/locale/$po/LC_MESSAGES/gimp14-perl.mo\n";
$uninstall .= " \$(RM_F) \$(datadir)/locale/$po/LC_MESSAGES/gimp-perl.mo\n"; $uninstall .= " \$(RM_F) \$(datadir)/locale/$po/LC_MESSAGES/gimp14-perl.mo\n";
$mofiles .= " $po.gmo"; $mofiles .= " $po.gmo";
} }
} else { } else {
@ -23,7 +23,7 @@ print "\n";
WriteMakefile( WriteMakefile(
NAME => 'i18n', NAME => 'i18n',
macro => \%cfg, macro => \%cfg,
realclean => { FILES => "gimp-perl.pot" }, realclean => { FILES => "gimp14-perl.pot" },
clean => { FILES => "*.mo" }, clean => { FILES => "*.mo" },
); );
@ -35,8 +35,8 @@ datadir = $datadir
%.gmo: %.po %.gmo: %.po
$MSGFMT -o \$*.gmo \$*.po $MSGFMT -o \$*.gmo \$*.po
%.po: gimp-perl.pot %.po: gimp14-perl.pot
-msgmerge -w 83 \$*.po gimp-perl.pot >\$*.po~ -msgmerge -w 83 \$*.po gimp14-perl.pot >\$*.po~
-if cmp -s \$*.po~ \$*.po; then rm -f \$*.po~ ; else mv \$*.po~ \$*.po; fi -if cmp -s \$*.po~ \$*.po; then rm -f \$*.po~ ; else mv \$*.po~ \$*.po; fi
all :: $alltarget all :: $alltarget
@ -46,11 +46,11 @@ update-gmo: $mofiles
update-po: update-pot update-po: update-pot
$updatepo $updatepo
gimp-perl.pot: update-pot gimp14-perl.pot: update-pot
update-pot: force update-pot: force
\$(PERL) ../pxgettext `find .. -type f -print | grep \'\\.pm\$\$\\|\\.xs\$\$\\|examples/\\|Perl-Server\'` > gimp-perl.pot~ \$(PERL) ../pxgettext `find .. -type f -print | grep \'\\.pm\$\$\\|\\.xs\$\$\\|examples/\\|Perl-Server\'` > gimp14-perl.pot~
#if cmp -s gimp-perl.pot~ gimp-perl.pot; then rm -f gimp-perl.pot~ ; else mv gimp-perl.pot~ gimp-perl.pot; fi #if cmp -s gimp14-perl.pot~ gimp14-perl.pot; then rm -f gimp14-perl.pot~ ; else mv gimp14-perl.pot~ gimp14-perl.pot; fi
force: force:

4
plug-ins/perl/po/Makefile.in.in
View File

@ -6,7 +6,7 @@
# but which still want to provide support for the GNU gettext functionality. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # Please note that the actual code is *not* freely available.
PACKAGE = gimp-perl PACKAGE = gimp14-perl
VERSION = @VERSION@ VERSION = @VERSION@
SHELL = /bin/sh SHELL = /bin/sh
@ -40,7 +40,7 @@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
INCLUDES = -I.. -I$(top_srcdir)/intl INCLUDES = -I..
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)

1
plug-ins/print/Makefile.am
View File

@ -45,7 +45,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/rcm/Makefile.am
View File

@ -30,7 +30,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

1
plug-ins/script-fu/Makefile.am
View File

@ -34,7 +34,6 @@ AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@

20
plug-ins/script-fu/script-fu-intl.h
View File

@ -24,17 +24,17 @@
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#ifdef HAVE_LC_MESSAGES #ifdef HAVE_LC_MESSAGES
#define INIT_I18N() G_STMT_START{ \ #define INIT_I18N() G_STMT_START{ \
setlocale(LC_MESSAGES, ""); \ setlocale(LC_MESSAGES, ""); \
bindtextdomain("gimp-libgimp", LOCALEDIR); \ bindtextdomain(GETTEXT_PACKAGE"-libgimp", LOCALEDIR); \
bindtextdomain("gimp-script-fu", LOCALEDIR); \ bindtextdomain(GETTEXT_PACKAGE"-script-fu", LOCALEDIR); \
textdomain("gimp-script-fu"); \ textdomain(GETTEXT_PACKAGE"-script-fu"); \
}G_STMT_END }G_STMT_END
#else #else
#define INIT_I18N() G_STMT_START{ \ #define INIT_I18N() G_STMT_START{ \
bindtextdomain("gimp-libgimp", LOCALEDIR); \ bindtextdomain(GETTEXT_PACKAGE"-libgimp", LOCALEDIR); \
bindtextdomain("gimp-script-fu", LOCALEDIR); \ bindtextdomain(GETTEXT_PACKAGE"-script-fu", LOCALEDIR); \
textdomain("gimp-script-fu"); \ textdomain(GETTEXT_PACKAGE"-script-fu"); \
}G_STMT_END }G_STMT_END
#endif #endif

1
plug-ins/sel2path/Makefile.am
View File

@ -37,7 +37,6 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) \ -I$(includedir) \
@STRIP_END@ @STRIP_END@