Commit 328b93d7 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

libgimp/stdplugins-intl.h use the new function gimp_locale_directory()

2002-05-11  Sven Neumann  <sven@gimp.org>

	* libgimp/stdplugins-intl.h
	* plug-ins/script-fu/script-fu-intl.h: use the new function
	gimp_locale_directory() instead of LOCALEDIR.

	* app/Makefile.am
	* plug-ins/*/Makefile.am: removed LOCALEDIR definition.
parent 33b27245
2002-05-11 Sven Neumann <sven@gimp.org>
* libgimp/stdplugins-intl.h
* plug-ins/script-fu/script-fu-intl.h: use the new function
gimp_locale_directory() instead of LOCALEDIR.
* app/Makefile.am
* plug-ins/*/Makefile.am: removed LOCALEDIR definition.
2002-05-11 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpwidgets.c (gimp_radio_group_new2): applied a
......
......@@ -97,8 +97,6 @@ endif
gimp_1_3_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLIBDIR=\""$(gimpplugindir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DG_LOG_DOMAIN=\"Gimp\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
......
......@@ -25,13 +25,15 @@
#include "gimpintl.h"
#define INIT_I18N() G_STMT_START{ \
setlocale (LC_ALL, ""); \
bindtextdomain(GETTEXT_PACKAGE"-libgimp", LOCALEDIR); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8"); \
bindtextdomain(GETTEXT_PACKAGE"-std-plug-ins", LOCALEDIR); \
#define INIT_I18N() G_STMT_START{ \
setlocale (LC_ALL, ""); \
bindtextdomain (GETTEXT_PACKAGE"-libgimp", \
gimp_locale_directory ()); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8"); \
bindtextdomain (GETTEXT_PACKAGE"-std-plug-ins", \
gimp_locale_directory ()); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-std-plug-ins", "UTF-8"); \
textdomain(GETTEXT_PACKAGE"-std-plug-ins"); \
textdomain (GETTEXT_PACKAGE"-std-plug-ins"); \
}G_STMT_END
#define INIT_I18N_UI() INIT_I18N()
......
......@@ -18,14 +18,10 @@ FractalExplorer_SOURCES = @STRIP_BEGIN@ \
pix_data.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -29,10 +29,6 @@ Lighting_SOURCES = @STRIP_BEGIN@ \
specref2.xpm \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/plug-ins/libgck \
......
......@@ -31,10 +31,6 @@ MapObject_SOURCES = @STRIP_BEGIN@ \
specref2.xpm \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/plug-ins/libgck \
......
......@@ -11,14 +11,10 @@ bmp_SOURCES = @STRIP_BEGIN@ \
bmpwrite.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -9,10 +9,6 @@ EXTRA_DIST = @STRIP_BEGIN@ \
winprint.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
......
......@@ -47,10 +47,6 @@ EXTRA_DIST = \@STRIP_BEGIN\@ \\
plugin-defs.pl$extra \\
\@STRIP_END\@
AM_CPPFLAGS = \@STRIP_BEGIN\@ \\
-DLOCALEDIR=\\""\$(localedir)"\\" \\
\@STRIP_END\@
INCLUDES = \@STRIP_BEGIN\@ \\
-I\$(top_srcdir) \\
\$(GTK_CFLAGS) \\
......
......@@ -5,21 +5,17 @@ libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = dbbrowser
dbbrowser_SOURCES = @STRIP_BEGIN@ \
dbbrowser.c \
dbbrowser_utils.c \
dbbrowser_utils.h \
dbbrowser.c \
dbbrowser_utils.c \
dbbrowser_utils.h \
@STRIP_END@
EXTRA_DIST = README
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -11,14 +11,10 @@ faxg3_SOURCES = @STRIP_BEGIN@ \
run_tbl.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -10,14 +10,10 @@ fits_SOURCES = @STRIP_BEGIN@ \
fitsrw.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -15,14 +15,10 @@ flame_SOURCES = @STRIP_BEGIN@ \
rect.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
EXTRA_DIST = README
......
......@@ -12,14 +12,10 @@ fp_SOURCES = @STRIP_BEGIN@ \
fp_misc.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -206,14 +206,10 @@ gap_navigator_dialog_SOURCES = @STRIP_BEGIN@ \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -47,14 +47,10 @@ gdyntext_SOURCES = @STRIP_BEGIN@ \
message_window.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -13,14 +13,10 @@ gfig_SOURCES = @STRIP_BEGIN@ \
EXTRA_DIST = README
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......@@ -32,16 +28,3 @@ LDADD = @STRIP_BEGIN@ \
$(GTK_LIBS) \
$(INTLLIBS) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
@for subdir in $(SUBDIRS); do \
files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
for file in $$files; do \
echo $$subdir/$$file; \
done; \
done
......@@ -10,14 +10,10 @@ gflare_SOURCES = @STRIP_BEGIN@ \
gflare.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -10,14 +10,10 @@ gfli_SOURCES = @STRIP_BEGIN@ \
gfli.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -32,16 +32,13 @@ EXTRA_DIST = \
README \
ChangeLog
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\" \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
AM_CPPFLAGS = -DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\"
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -10,10 +10,6 @@ helpbrowser_SOURCES = @STRIP_BEGIN@ \
queue.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTKHTML2_CFLAGS) \
......
......@@ -13,14 +13,10 @@ ifscompose_SOURCES = @STRIP_BEGIN@ \
EXTRA_DIST = README.ifscompose
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -168,10 +168,6 @@ imagemap_SOURCES = @STRIP_BEGIN@ \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
......
......@@ -12,14 +12,10 @@ maze_SOURCES = @STRIP_BEGIN@ \
maze_face.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -9,14 +9,10 @@ mosaic_SOURCES = @STRIP_BEGIN@ \
mosaic_logo.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -16,14 +16,10 @@ pagecurl_SOURCES = @STRIP_BEGIN@ \
curl7.xpm \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -7,9 +7,6 @@ libexec_PROGRAMS = plugin-helper
plugin_helper_SOURCES = \
plugin-helper.c
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
INCLUDES = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
......
......@@ -12,10 +12,6 @@ print_SOURCES = @STRIP_BEGIN@ \
print_gimp.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
......
......@@ -24,14 +24,10 @@ EXTRA_DIST = @STRIP_BEGIN@ \
pixmaps/rcm_cw.xpm \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -30,12 +30,10 @@ script_fu_SOURCES = @STRIP_BEGIN@ \
siod-wrapper.h \
@STRIP_END@
AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
if HAVE_GLIBC_REGEX
......
......@@ -25,11 +25,13 @@
#define INIT_I18N() G_STMT_START{ \
setlocale (LC_ALL, ""); \
bindtextdomain(GETTEXT_PACKAGE"-libgimp", LOCALEDIR); \
bindtextdomain (GETTEXT_PACKAGE"-libgimp", \
gimp_locale_directory ()); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8"); \
bindtextdomain(GETTEXT_PACKAGE"-script-fu", LOCALEDIR); \
bindtextdomain (GETTEXT_PACKAGE"-script-fu", \
gimp_locale_directory ()); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-script-fu", "UTF-8"); \
textdomain(GETTEXT_PACKAGE"-script-fu"); \
textdomain (GETTEXT_PACKAGE"-script-fu"); \
}G_STMT_END
#endif /* __SCRIPT_FU_INTL_H__ */
......@@ -31,14 +31,10 @@ EXTRA_DIST = \
README \
README.limn
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -10,14 +10,10 @@ sgi_SOURCES = @STRIP_BEGIN@ \
sgilib.c \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -15,9 +15,6 @@ tool_safe_mode_SOURCES = \
gimptoolcontrol.c \
gimptoolcontrol.h
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
......
libexecdir = $(gimpplugindir)/tool-plug-ins
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app/ \
......
......@@ -8,20 +8,14 @@ libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = webbrowser
webbrowser_SOURCES = @STRIP_BEGIN@ \
webbrowser.c \
@STRIP_END@
webbrowser_SOURCES = webbrowser.c
EXTRA_DIST = $(scriptdata_DATA)
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
......@@ -5,7 +5,7 @@ libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = xjt
EXTRA_DIST = \
README \
README \
README_xjt_fileformat.txt
xjt_SOURCES = @STRIP_BEGIN@ \
......@@ -16,14 +16,10 @@ xjt_SOURCES = @STRIP_BEGIN@ \
xpdb_calls.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
LDADD = @STRIP_BEGIN@ \
......
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