Commit c78dd295 authored by Manish Singh's avatar Manish Singh
Browse files

configure.in tools/Makefile.am integrated pdbgen into the build system

* configure.in
* tools/Makefile.am
* tools/pdbgen/Makefile.am: integrated pdbgen into the build system

* libgimp/gimp.h
* libgimp/gimpimage.c: renamed gimp_image_findnext_guide to
gimp_image_find_next_guide, so change pdb wrapper

* plug-ins/guillotine/guillotine.c: reflect api change

-Yosh
parent 63936274
Tue Apr 27 23:52:26 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in
* tools/Makefile.am
* tools/pdbgen/Makefile.am: integrated pdbgen into the build system
* libgimp/gimp.h
* libgimp/gimpimage.c: renamed gimp_image_findnext_guide to
gimp_image_find_next_guide, so change pdb wrapper
* plug-ins/guillotine/guillotine.c: reflect api change
Tue Apr 27 22:59:08 MEST 1999 Sven Neumann <sven@gimp.org>
* app/tool_options.c
......
......@@ -20,127 +20,128 @@
#include "config.h"
#include <glib.h>
#include "app_procs.h"
#include "libgimp/gimpintl.h"
/* Forward declarations for registering PDB procs */
void register_gdisplay_procs (void);
void register_brush_select_procs (void);
void register_brushes_procs (void);
void register_channel_procs (void);
void register_channel_ops_procs (void);
void register_color_procs (void);
void register_convert_procs (void);
void register_drawable_procs (void);
void register_edit_procs (void);
void register_floating_sel_procs (void);
void register_undo_procs (void);
void register_palette_procs (void);
void register_gradient_procs (void);
void register_convert_procs (void);
void register_channel_ops_procs (void);
void register_gdisplay_procs (void);
void register_gimage_procs (void);
void register_gimage_mask_procs (void);
void register_gimprc_procs (void);
void register_drawable_procs (void);
void register_gradient_procs (void);
void register_gradient_select_procs (void);
void register_guides_procs (void);
void register_layer_procs (void);
void register_misc_procs (void);
void register_palette_procs (void);
void register_parasite_procs (void);
void register_paths_procs (void);
void register_gradient_select_procs (void);
void register_unit_procs (void);
void register_pattern_select_procs (void);
void register_patterns_procs (void);
void register_procedural_db_procs (void);
void register_brushes_procs (void);
void register_text_tool_procs (void);
void register_brush_select_procs (void);
void register_color_procs (void);
void register_misc_procs (void);
void register_tools_procs (void);
void register_channel_procs (void);
void register_patterns_procs (void);
void register_pattern_select_procs (void);
void register_layer_procs (void);
void register_gimage_mask_procs (void);
void register_gimage_procs (void);
void register_guides_procs (void);
void register_undo_procs (void);
void register_unit_procs (void);
/* 281 procedures registered total */
void
internal_procs_init (void)
{
app_init_update_status (_("Internal Procedures"), _("GDisplay procedures"), 0.0);
register_gdisplay_procs ();
app_init_update_status (NULL, _("Edit procedures"), 0.011);
register_edit_procs ();
app_init_update_status (_("Internal Procedures"), _("Brush UI"), 0.0);
register_brush_select_procs ();
app_init_update_status (NULL, _("Floating selections"), 0.032);
register_floating_sel_procs ();
app_init_update_status (NULL, _("Brushes"), 0.011);
register_brushes_procs ();
app_init_update_status (NULL, _("Undo"), 0.053);
register_undo_procs ();
app_init_update_status (NULL, _("Channel"), 0.05);
register_channel_procs ();
app_init_update_status (NULL, _("Palette"), 0.06);
register_palette_procs ();
app_init_update_status (NULL, _("Channel Ops"), 0.1);
register_channel_ops_procs ();
app_init_update_status (NULL, _("Gradients"), 0.085);
register_gradient_procs ();
app_init_update_status (NULL, _("Color"), 0.107);
register_color_procs ();
app_init_update_status (NULL, _("Convert"), 0.103);
app_init_update_status (NULL, _("Convert"), 0.149);
register_convert_procs ();
app_init_update_status (NULL, _("Channel Ops"), 0.117);
register_channel_ops_procs ();
app_init_update_status (NULL, _("Gimprc procedures"), 0.125);
register_gimprc_procs ();
app_init_update_status (NULL, _("Drawable procedures"), 0.132);
app_init_update_status (NULL, _("Drawable procedures"), 0.164);
register_drawable_procs ();
app_init_update_status (NULL, _("Parasite procedures"), 0.206);
register_parasite_procs ();
app_init_update_status (NULL, _("Edit procedures"), 0.238);
register_edit_procs ();
app_init_update_status (NULL, _("Paths"), 0.253);
register_paths_procs ();
app_init_update_status (NULL, _("Floating selections"), 0.26);
register_floating_sel_procs ();
app_init_update_status (NULL, _("Gradient UI"), 0.285);
register_gradient_select_procs ();
app_init_update_status (NULL, _("GDisplay procedures"), 0.281);
register_gdisplay_procs ();
app_init_update_status (NULL, _("Units"), 0.299);
register_unit_procs ();
app_init_update_status (NULL, _("Image"), 0.292);
register_gimage_procs ();
app_init_update_status (NULL, _("Procedural database"), 0.338);
register_procedural_db_procs ();
app_init_update_status (NULL, _("Image mask"), 0.48);
register_gimage_mask_procs ();
app_init_update_status (NULL, _("Brushes"), 0.367);
register_brushes_procs ();
app_init_update_status (NULL, _("Gimprc procedures"), 0.541);
register_gimprc_procs ();
app_init_update_status (NULL, _("Text procedures"), 0.406);
register_text_tool_procs ();
app_init_update_status (NULL, _("Gradients"), 0.548);
register_gradient_procs ();
app_init_update_status (NULL, _("Brush UI"), 0.42);
register_brush_select_procs ();
app_init_update_status (NULL, _("Gradient UI"), 0.566);
register_gradient_select_procs ();
app_init_update_status (NULL, _("Color"), 0.431);
register_color_procs ();
app_init_update_status (NULL, _("Guide procedures"), 0.58);
register_guides_procs ();
app_init_update_status (NULL, _("Miscellaneous"), 0.473);
app_init_update_status (NULL, _("Layer"), 0.601);
register_layer_procs ();
app_init_update_status (NULL, _("Miscellaneous"), 0.708);
register_misc_procs ();
app_init_update_status (NULL, _("Tool procedures"), 0.477);
register_tools_procs ();
app_init_update_status (NULL, _("Palette"), 0.712);
register_palette_procs ();
app_init_update_status (NULL, _("Channel"), 0.548);
register_channel_procs ();
app_init_update_status (NULL, _("Parasite procedures"), 0.737);
register_parasite_procs ();
app_init_update_status (NULL, _("Patterns"), 0.598);
register_patterns_procs ();
app_init_update_status (NULL, _("Paths"), 0.783);
register_paths_procs ();
app_init_update_status (NULL, _("Pattern UI"), 0.612);
app_init_update_status (NULL, _("Pattern UI"), 0.815);
register_pattern_select_procs ();
app_init_update_status (NULL, _("Layer"), 0.623);
register_layer_procs ();
app_init_update_status (NULL, _("Patterns"), 0.826);
register_patterns_procs ();
app_init_update_status (NULL, _("Image mask"), 0.73);
register_gimage_mask_procs ();
app_init_update_status (NULL, _("Procedural database"), 0.84);
register_procedural_db_procs ();
app_init_update_status (NULL, _("Image"), 0.79);
register_gimage_procs ();
app_init_update_status (NULL, _("Text procedures"), 0.868);
register_text_tool_procs ();
app_init_update_status (NULL, _("Guide procedures"), 0.979);
register_guides_procs ();
app_init_update_status (NULL, _("Tool procedures"), 0.883);
register_tools_procs ();
app_init_update_status (NULL, _("Undo"), 0.954);
register_undo_procs ();
app_init_update_status (NULL, _("Units"), 0.961);
register_unit_procs ();
}
......@@ -59,15 +59,10 @@ AC_ARG_WITH(gcg, [ --with-gcg build 'gcg' code generation tool],
,
with_gcg=$enable_maintainer_mode)
if eval "test x$with_gcg = xyes"; then
GCG_SUBDIRS="tools/gcg"
else
GCG_SUBDIRS=""
if test "x$with_gcg" = xyes; then
AC_CONFIG_SUBDIRS(tools/gcg)
fi
AC_SUBST(GCG_SUBDIRS)
AC_CONFIG_SUBDIRS($GCG_SUBDIRS)
AC_ARG_ENABLE(gcg-deps, [ --enable-gcg-deps turn on dynamic gcg dependency tracking (need gcc and gnu make)],
,
if eval "test x$GCC$with_gnu_make$with_gcg = xyesyesyes"; then
......@@ -530,8 +525,18 @@ fi
dnl This is for the gimp-perl plug-in
AC_ARG_ENABLE(perl, [ --disable-perl do not build perl extension [by default enabled]])
if eval "test x$enable_perl != xno"; then
AC_PATH_PROGS(PERL,perl perl5.005 perl5.004,perl)
AC_ARG_WITH(pdbgen, [ --with-pdbgen use 'pdbgen' code generation tool],
,
with_pdbgen=$enable_maintainer_mode)
if test "x$enable_perl" != xno || test "x$with_pdbgen" = xyes ; then
AC_PATH_PROGS(PERL,perl5 perl perl5.005 perl5.004,perl)
fi
AM_CONDITIONAL(WITH_PDBGEN, test x$with_pdbgen = xyes)
if test "x$enable_perl" != xno; then
AC_MSG_CHECKING(for perl version >= 5.004_04)
if test "`$PERL -e 'print $]>=5.004_04'`" = "1"; then
AC_MSG_RESULT(yes)
......
......@@ -523,7 +523,7 @@ gint32 gimp_image_add_vguide (gint32 image_ID,
gint32 yposition);
void gimp_image_delete_guide (gint32 image_ID,
gint32 guide_ID);
gint32 gimp_image_findnext_guide (gint32 image_ID,
gint32 gimp_image_find_next_guide (gint32 image_ID,
gint32 guide_ID);
GOrientation gimp_image_get_guide_orientation (gint32 image_ID,
gint32 guide_ID);
......
......@@ -83,14 +83,14 @@ gimp_image_delete_guide (gint32 image_id,
}
gint32
gimp_image_findnext_guide (gint32 image_id,
gint32 guide_id)
gimp_image_find_next_guide (gint32 image_id,
gint32 guide_id)
{
GParam *return_vals;
int nreturn_vals;
gint32 rtn_guide_id;
return_vals = gimp_run_procedure ("gimp_image_findnext_guide",
return_vals = gimp_run_procedure ("gimp_image_find_next_guide",
&nreturn_vals,
PARAM_IMAGE, image_id,
PARAM_INT32, guide_id,
......
......@@ -83,14 +83,14 @@ gimp_image_delete_guide (gint32 image_id,
}
gint32
gimp_image_findnext_guide (gint32 image_id,
gint32 guide_id)
gimp_image_find_next_guide (gint32 image_id,
gint32 guide_id)
{
GParam *return_vals;
int nreturn_vals;
gint32 rtn_guide_id;
return_vals = gimp_run_procedure ("gimp_image_findnext_guide",
return_vals = gimp_run_procedure ("gimp_image_find_next_guide",
&nreturn_vals,
PARAM_IMAGE, image_id,
PARAM_INT32, guide_id,
......
......@@ -140,7 +140,7 @@ guillotine(gint32 image_ID)
num_vguides = 0;
num_hguides = 0;
guide_num = gimp_image_findnext_guide(image_ID, 0);
guide_num = gimp_image_find_next_guide(image_ID, 0);
/* Count the guides so we can allocate appropriate memory */
if (guide_num>0)
......@@ -157,7 +157,7 @@ guillotine(gint32 image_ID)
printf("Aie! Aie! Aie!\n");
gimp_quit();
}
guide_num = gimp_image_findnext_guide(image_ID, guide_num);
guide_num = gimp_image_find_next_guide(image_ID, guide_num);
}
while (guide_num>0);
}
......@@ -181,7 +181,7 @@ guillotine(gint32 image_ID)
num_hguides = 0;
vguides[num_vguides++] = 0;
hguides[num_hguides++] = 0;
guide_num = gimp_image_findnext_guide(image_ID, 0);
guide_num = gimp_image_find_next_guide(image_ID, 0);
if (guide_num>0)
{
do
......@@ -198,7 +198,7 @@ guillotine(gint32 image_ID)
printf("Aie! Aie! Aie! Too!\n");
gimp_quit();
}
guide_num = gimp_image_findnext_guide(image_ID, guide_num);
guide_num = gimp_image_find_next_guide(image_ID, guide_num);
}
while (guide_num>0);
}
......
......@@ -140,7 +140,7 @@ guillotine(gint32 image_ID)
num_vguides = 0;
num_hguides = 0;
guide_num = gimp_image_findnext_guide(image_ID, 0);
guide_num = gimp_image_find_next_guide(image_ID, 0);
/* Count the guides so we can allocate appropriate memory */
if (guide_num>0)
......@@ -157,7 +157,7 @@ guillotine(gint32 image_ID)
printf("Aie! Aie! Aie!\n");
gimp_quit();
}
guide_num = gimp_image_findnext_guide(image_ID, guide_num);
guide_num = gimp_image_find_next_guide(image_ID, guide_num);
}
while (guide_num>0);
}
......@@ -181,7 +181,7 @@ guillotine(gint32 image_ID)
num_hguides = 0;
vguides[num_vguides++] = 0;
hguides[num_hguides++] = 0;
guide_num = gimp_image_findnext_guide(image_ID, 0);
guide_num = gimp_image_find_next_guide(image_ID, 0);
if (guide_num>0)
{
do
......@@ -198,7 +198,7 @@ guillotine(gint32 image_ID)
printf("Aie! Aie! Aie! Too!\n");
gimp_quit();
}
guide_num = gimp_image_findnext_guide(image_ID, guide_num);
guide_num = gimp_image_find_next_guide(image_ID, guide_num);
}
while (guide_num>0);
}
......
#if FALSE
#D_pdbgen=pdbgen
#else
#D_pdbgen=
#endif
if WITH_PDBGEN
D_pdbgen=pdbgen
else
D_pdbgen=
endif
if WITH_GCG
D_gcg=gcg
......@@ -10,4 +10,4 @@ else
D_gcg=
endif
SUBDIRS = $(D_gcg) # $(D_pdbgen)
SUBDIRS = $(D_gcg) $(D_pdbgen)
Makefile
Makefile.in
stamp-enums
stamp-groups
stamp-app
PDBGEN_BACKUP = 0
PDBGEN_GROUPS =
pdb_sources = \
pdb/brush_select.pdb \
pdb/brushes.pdb \
pdb/channel.pdb \
pdb/channel_ops.pdb \
pdb/color.pdb \
pdb/convert.pdb \
pdb/drawable.pdb \
pdb/edit.pdb \
pdb/floating_sel.pdb \
pdb/gdisplay.pdb \
pdb/gimage.pdb \
pdb/gimage_mask.pdb \
pdb/gimprc.pdb \
pdb/gradient.pdb \
pdb/gradient_select.pdb \
pdb/guides.pdb \
pdb/layer.pdb \
pdb/misc.pdb \
pdb/palette.pdb \
pdb/parasite.pdb \
pdb/paths.pdb \
pdb/pattern_select.pdb \
pdb/patterns.pdb \
pdb/procedural_db.pdb \
pdb/text_tool.pdb \
pdb/tools.pdb \
pdb/undo.pdb \
pdb/unit.pdb
EXTRA_DIST = \
README \
app.pl \
enumgen.pl \
groups.pl \
lib.pl \
pdb.pl \
pdbgen.pl \
stddefs.pdb \
util.pl \
$(pdb_sources)
enum_headers = \
../../app/convert.h \
../../app/channel_ops.h \
../../app/text_tool.h \
../../app/gimpdrawable.h \
../../app/gimpimage.h \
../../app/procedural_db.h \
../../app/paint_funcs.h \
../../app/blend.h \
../../app/bucket_fill.h \
../../app/clone.h \
../../app/convolve.h \
../../app/channel.h \
../../app/eraser.h \
../../app/paint_core.h \
../../app/lut_funcs.h \
../../app/shear_tool.h \
../../app/color_balance.h \
../../app/hue_saturation.h \
../../app/layerF.h \
../../app/layer.h
enums.pl: enumgen.pl $(enum_headers)
$(top_srcdir)/app/convert.h \
$(top_srcdir)/app/channel_ops.h \
$(top_srcdir)/app/text_tool.h \
$(top_srcdir)/app/gimpdrawable.h \
$(top_srcdir)/app/gimpimage.h \
$(top_srcdir)/app/procedural_db.h \
$(top_srcdir)/app/paint_funcs.h \
$(top_srcdir)/app/blend.h \
$(top_srcdir)/app/bucket_fill.h \
$(top_srcdir)/app/clone.h \
$(top_srcdir)/app/convolve.h \
$(top_srcdir)/app/channel.h \
$(top_srcdir)/app/eraser.h \
$(top_srcdir)/app/paint_core.h \
$(top_srcdir)/app/lut_funcs.h \
$(top_srcdir)/app/shear_tool.h \
$(top_srcdir)/app/color_balance.h \
$(top_srcdir)/app/hue_saturation.h \
$(top_srcdir)/app/layerF.h \
$(top_srcdir)/app/layer.h
pdb_scripts = \
$(srcdir)/pdbgen.pl \
$(srcdir)/stddefs.pdb \
$(srcdir)/pdb.pl \
$(srcdir)/util.pl \
$(srcdir)/enums.pl \
$(srcdir)/groups.pl
$(srcdir)/enums.pl: stamp-enums
@:
stamp-enums: $(srcdir)/enumgen.pl $(enum_headers)
(srcdir=$(srcdir) && $(PERL) enumgen.pl $(enum_headers)) \
&& echo timestamp > stamp-enums
$(srcdir)/groups.pl: stamp-groups
@:
stamp-groups: Makefile.am
cd $(srcdir) \
&& $(PERL) enumgen.pl $(enum_headers)
&& echo "# This file is autogenerated" > $(srcdir)/groups.pl.tmp \
&& echo "@groups = qw(" >> $(srcdir)/groups.pl.tmp \
&& (for pdb in $(pdb_sources); do \
group=`echo $$pdb | sed -e 's%pdb/\([^.]*\)\..*%\1%'`; \
echo " $$group" >> $(srcdir)/groups.pl.tmp; \
done) \
&& echo ");" >> $(srcdir)/groups.pl.tmp \
&& (cmp -s groups.pl.tmp groups.pl || cp groups.pl.tmp groups.pl) \
&& rm groups.pl.tmp \
&& echo timestamp > stamp-groups
stamp-app: $(srcdir)/app.pl $(pdb_scripts) $(pdb_sources)
(srcdir=$(srcdir) destdir=$(top_srcdir) \
PDBGEN_BACKUP=$(PDBGEN_BACKUP) PDBGEN_GROUPS=$(PDBGEN_GROUPS) \
$(PERL) pdbgen.pl app) \
&& echo timestamp > stamp-app
all-local: stamp-app
......@@ -671,7 +671,7 @@ GPL
$pcount += $out->{pcount};
}
if (!exists $ENV{PDBGEN_GROUPS}) {
if (! $ENV{PDBGEN_GROUPS}) {
my $internal = "$destdir/internal_procs.h$FILE_EXT";
open IFILE, "> $internal" or die "Can't open $cmdfile: $!\n";
print IFILE $gpl;
......@@ -691,6 +691,7 @@ HEADER
open IFILE, "> $internal" or die "Can't open $cmdfile: $!\n";
print IFILE $gpl;
print IFILE qq@#include "config.h"\n\n@;
print IFILE qq@#include <glib.h>\n@;
print IFILE qq@#include "app_procs.h"\n\n@;
print IFILE qq@#include "libgimp/gimpintl.h"\n\n@;
print IFILE "/* Forward declarations for registering PDB procs */\n\n";
......
......@@ -18,8 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
BEGIN {
$srcdir = '.';
$destdir = '.';
$srcdir = $ENV{srcdir} || '.';
$destdir = $ENV{srcdir} || '.';
}
use lib $srcdir;
......
# The GIMP -- an image manipulation program
# Copyright (C) 1998-1999 Manish Singh <yosh@gimp.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Modify this list for the groups to parse in the pdb directory
@groups = qw(gdisplay edit floating_sel undo palette gradient convert
channel_ops gimprc drawable parasite paths gradient_select
unit procedural_db brushes text_tool brush_select color
misc tools channel patterns pattern_select layer gimage_mask
gimage guides);
# This file is autogenerated
@groups = qw(
brush_select
brushes
channel
channel_ops
color
convert
drawable
edit
floating_sel
gdisplay
gimage
gimage_mask
gimprc
gradient
gradient_select
guides
layer
misc
palette
parasite
paths
pattern_select
patterns
procedural_db
text_tool
tools
undo
unit
);