removed the authorgen hack. It broke the build with autoconf-2.52. Need to

2001-08-28  Sven Neumann  <sven@gimp.org>

        * configure.in: removed the authorgen hack. It broke the build with
        autoconf-2.52. Need to come up with a better idea. Until then the
        manpages don't show the autors anymore.
        Removed the useless definitions of brushdata, palettedata, ...
        while I was on it.

        * data/Makefile.am
        * data/brushes/Makefile.am
        * data/gradients/Makefile.am
        * data/palettes/Makefile.am
        * data/patterns/Makefile.am: do it the conventional way and list all
        data files in the Makefiles.
This commit is contained in:
Sven Neumann 2001-08-28 16:37:59 +00:00 committed by Sven Neumann
parent dc5a9b4b6b
commit 61c922f6f0
7 changed files with 25 additions and 91 deletions

View File

@ -1,3 +1,18 @@
2001-08-28 Sven Neumann <sven@gimp.org>
* configure.in: removed the authorgen hack. It broke the build with
autoconf-2.52. Need to come up with a better idea. Until then the
manpages don't show the autors anymore.
Removed the useless definitions of brushdata, palettedata, ...
while I was on it.
* data/Makefile.am
* data/brushes/Makefile.am
* data/gradients/Makefile.am
* data/palettes/Makefile.am
* data/patterns/Makefile.am: do it the conventional way and list all
data files in the Makefiles.
2001-08-28 Sven Neumann <sven@gimp.org>
* HACKING

View File

@ -605,16 +605,6 @@ gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
palettedata=`ls -1 $srcdir/data/palettes | grep -v Makefile`
patterndata=`ls -1 $srcdir/data/patterns | grep -v Makefile`
brushdata=`echo $brushdata`
gradientdata=`echo $gradientdata`
palettedata=`echo $palettedata`
patterndata=`echo $patterndata`
dnl This is for generating PDB docuemntation.
AC_PATH_PROGS(EMACS, emacs xemacs, :)
@ -749,21 +739,6 @@ if test -n "$DISTMAKE"; then
XJT=xjt XPM=xpm
fi
dnl eek, what a hack...
rm -f confauthorsgen
IFS="${IFS= }"; gimp_save_IFS="$IFS"; IFS='
'
for i in `sed -e '/^#/d' -e 's/\.*\[.*\]//' -e 's/^ *//' -e 's/ *$//' -e '/^$/d' < $srcdir/tools/authorsgen/contributors`; do
echo $ac_n "$i, $ac_c" >> confauthorsgen
done
IFS="$gimp_save_IFS"
GIMP_CONTRIBUTORS=`sed -e 's/, $/./' < confauthorsgen`
rm -f confauthorsgen
AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
CPPFLAGS="${CPPFLAGS} -DGTK_DISABLE_COMPAT_H"
@ -795,10 +770,6 @@ AC_SUBST(gimpdatadir)
AC_SUBST(gimpplugindir)
AC_SUBST(gimpsysconfdir)
AC_SUBST(localedir)
AC_SUBST(brushdata)
AC_SUBST(gradientdata)
AC_SUBST(palettedata)
AC_SUBST(patterndata)
AC_SUBST(GIMP_REMOTE)
AC_SUBST(WEBBROWSER)
AC_SUBST(LIBXMU)

View File

@ -2,11 +2,6 @@
SUBDIRS = brushes gradients palettes patterns
brushdata=
gradientdata=
palettedata=
patterndata=
.PHONY: files
files:

View File

@ -1,17 +1,6 @@
brushdatadir = $(gimpdatadir)/brushes
brushdata =
gradientdata =
palettedata =
patterndata =
brushdata_DATA = @brushdata@
EXTRA_DIST = $(brushdata_DATA)
.PHONY: files
FILES = \
brushdata = \
10x10square.gbr \
10x10squareBlur.gbr \
11circle.gbr \
@ -40,6 +29,9 @@ FILES = \
DStar11.gbr \
DStar17.gbr \
DStar25.gbr \
SketchBrush-16.gih \
SketchBrush-32.gih \
SketchBrush-64.gih \
callig1.gbr \
callig2.gbr \
callig3.gbr \
@ -55,11 +47,4 @@ FILES = \
pepper.gbr \
pixel.gbr \
thegimp.gbr \
SketchBrush-16.gih \
SketchBrush-32.gih \
SketchBrush-64.gih \
xcf.gbr
install-data-local:
rm -f $(brushdatadir)/round1.vbr $(brushdatadir)/pepper.gpb

View File

@ -1,17 +1,6 @@
gradientdatadir = $(gimpdatadir)/gradients
brushdata =
gradientdata =
palettedata =
patterndata =
gradientdata_DATA = @gradientdata@
EXTRA_DIST = $(gradientdata_DATA)
.PHONY: files
FILES = \
gradientdata_DATA = \
Abstract_1.ggr \
Abstract_2.ggr \
Abstract_3.ggr \

View File

@ -1,23 +1,13 @@
palettedatadir = $(gimpdatadir)/palettes
brushdata =
gradientdata =
palettedata =
patterndata =
palettedata_DATA = @palettedata@
EXTRA_DIST = $(palettedata_DATA)
.PHONY: files
FILES = \
Blues.gpl \
palettedata_DATA = \
Bears.gpl \
Bgold.gpl \
Blues.gpl \
Borders.gpl \
Browns_And_Yellows.gpl \
Caramel.gpl \
Cascade.gpl \
China.gpl \
Coldfire.gpl \
Cool_Colors.gpl \
@ -46,7 +36,7 @@ FILES = \
Royal.gpl \
Topographic.gpl \
Visibone.gpl \
Visibone2.gpl \
Visibone_2.gpl \
Volcano.gpl \
Warm_Colors.gpl \
Web.gpl

View File

@ -1,17 +1,6 @@
patterndatadir = $(gimpdatadir)/patterns
brushdata =
gradientdata =
palettedata =
patterndata =
patterndata_DATA = @patterndata@
EXTRA_DIST = $(patterndata_DATA)
.PHONY: files
FILES = \
patterndata_DATA = \
3dgreen.pat \
Craters.pat \
Moonfoot.pat \