Commit 3413a9ef authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

small fix.

2001-11-12  Michael Natterer  <mitch@gimp.org>

	* HACKING: small fix.

	* configure.in: changed --disable-perl to --enable-perl because
	it doesn't build properly at the moment.

	* pixmaps/Makefile.am: removed stuff which is no longer there
	from EXTRA_DIST.

	* plug-ins/Makefile.am: put back the $(GIMP_PERL) line in SUBDIRS.

	* app/widgets/gimpmenuitem.c. include "libgimpwidgets/gimpwidgets.h".

	* data/Makefile.am
	* data/brushes/Makefile.am
	* data/gradients/Makefile.am
	* data/palettes/Makefile.am
	* data/patterns/Makefile.am: removed the old "files" hack and put
	the stuff to EXTRA_DIST.

	* app/Makefile.am
	* app/base/Makefile.am
	* app/core/Makefile.am
	* app/file/Makefile.am
	* app/gui/Makefile.am
	* app/paint-funcs/Makefile.am
	* app/pdb/Makefile.am
	* app/tools/Makefile.am
	* app/widgets/Makefile.am
	* app/widgets/gimpmenuitem.c
	* app/xcf/Makefile.am
	* cursors/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am
	* libgimpcolor/Makefile.am
	* libgimpmath/Makefile.am
	* libgimpwidgets/Makefile.am
	* m4macros/Makefile.am
	* themes/Makefile.am
	* themes/Default/Makefile.am
	* themes/Default/images/Makefile.am
	* themes/Default/images/tools/Makefile.am: removed "files" target.
parent a38c2635
2001-11-12 Michael Natterer <mitch@gimp.org>
* HACKING: small fix.
* configure.in: changed --disable-perl to --enable-perl because
it doesn't build properly at the moment.
* pixmaps/Makefile.am: removed stuff which is no longer there
from EXTRA_DIST.
* plug-ins/Makefile.am: put back the $(GIMP_PERL) line in SUBDIRS.
* app/widgets/gimpmenuitem.c. include "libgimpwidgets/gimpwidgets.h".
* data/Makefile.am
* data/brushes/Makefile.am
* data/gradients/Makefile.am
* data/palettes/Makefile.am
* data/patterns/Makefile.am: removed the old "files" hack and put
the stuff to EXTRA_DIST.
* app/Makefile.am
* app/base/Makefile.am
* app/core/Makefile.am
* app/file/Makefile.am
* app/gui/Makefile.am
* app/paint-funcs/Makefile.am
* app/pdb/Makefile.am
* app/tools/Makefile.am
* app/widgets/Makefile.am
* app/widgets/gimpmenuitem.c
* app/xcf/Makefile.am
* cursors/Makefile.am
* libgimp/Makefile.am
* libgimpbase/Makefile.am
* libgimpcolor/Makefile.am
* libgimpmath/Makefile.am
* libgimpwidgets/Makefile.am
* m4macros/Makefile.am
* themes/Makefile.am
* themes/Default/Makefile.am
* themes/Default/images/Makefile.am
* themes/Default/images/tools/Makefile.am: removed "files" target.
2001-11-12 Sven Neumann <sven@gimp.org>
* po/Makefile.in.in
......
......@@ -112,7 +112,8 @@ wrappers around functions of parent classes. If you end up duplicating code,
try to create a common parent class and implement the common methods there.
Don't include headers in headers except where unavoidable (e.g. for
deriving objects). Opaque typedefs go to app/apptypes.h
deriving objects). Opaque typedefs go to app/base/base-types.h,
app/core/core-types.h etc.
Don't use the GTK wrappers around the GLib object and signal system.
......
......@@ -152,12 +152,5 @@ gimp_LDADD = @STRIP_BEGIN@ \
$(REGEXREPL) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/app/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=app/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -57,10 +57,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -153,7 +153,7 @@ EXTRS_DIST = \
gen_sources = xgen-gmh xgen-gmc
CLEANFILES += $(gen_sources)
$(srcdir)/stamp-gimpmarshal.h: gimpmarshal.list gimpmarshal.h
$(srcdir)/stamp-gimpmarshal.h: $(srcdir)/gimpmarshal.list gimpmarshal.h
echo "#ifndef __GIMP_MARSHAL_H__" > xgen-gmh \
&& echo "#define __GIMP_MARSHAL_H__" >> xgen-gmh \
&& glib-genmarshal --nostdinc --prefix=gimp_cclosure_marshal $(srcdir)/gimpmarshal.list --header >> xgen-gmh \
......@@ -168,10 +168,3 @@ $(srcdir)/gimpmarshal.c: $(srcdir)/stamp-gimpmarshal.h
&& glib-genmarshal --nostdinc --prefix=gimp_cclosure_marshal $(srcdir)/gimpmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gimpmarshal.c \
&& rm -f xgen-gmc xgen-gmc~
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -23,10 +23,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -135,10 +135,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -31,10 +31,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -55,10 +55,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -131,10 +131,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(PANGOFT2_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -113,10 +113,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(PANGOFT2_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "core/gimpmarshal.h"
......
......@@ -9,6 +9,7 @@ libappxcf_a_SOURCES = @STRIP_BEGIN@ \
xcf-load.h \
xcf-read.c \
xcf-read.h \
xcf-private.h \
xcf-save.c \
xcf-save.h \
xcf-seek.c \
......@@ -29,10 +30,3 @@ INCLUDES = @STRIP_BEGIN@ \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -661,8 +661,8 @@ GIMP_PRINT_VERSION="4.0.4"
GIMP_PRINT_RELEASE_DATE="02\ Dec\ 2000"
dnl This is for the gimp-perl plug-in
AC_ARG_ENABLE(perl, [ --disable-perl do not build perl extension [by default enabled]
--enable-perl[=prefix] use specified prefix for perl (see INSTALL)])
AC_ARG_ENABLE(perl, [ --enable-perl build perl extension [by default disabled]
--enable-perl[=prefix] use specified prefix for perl (see INSTALL)], , enable_perl=no)
AC_ARG_WITH(pdbgen, [ --with-pdbgen use 'pdbgen' code generation tool],
,
......
......@@ -97,10 +97,3 @@ EXTRA_DIST = \
smudge_small_mask.xbm \
measure_small.xbm \
measure_small_mask.xbm
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
## Process this file with automake to produce Makefile.in
## Makefile.am for gimp/data
SUBDIRS = brushes gradients palettes patterns
.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
EXTRA_DIST = AUTHORS ChangeLog README
## Makefile.am for gimp/data/brushes
brushdatadir = $(gimpdatadir)/brushes
brushdata = \
brushdata_DATA = \
10x10square.gbr \
10x10squareBlur.gbr \
11circle.gbr \
......@@ -48,3 +50,5 @@ brushdata = \
pixel.gbr \
thegimp.gbr \
xcf.gbr
EXTRA_DIST = $(brushdata_DATA)
## Makefile.am for gimp/data/gradients
gradientdatadir = $(gimpdatadir)/gradients
gradientdata_DATA = \
......@@ -79,3 +81,5 @@ gradientdata_DATA = \
Wood_2.ggr \
Yellow_Contrast.ggr \
Yellow_Orange.ggr
EXTRA_DIST = $(gradientdata_DATA)
## Makefile.am for gimp/data/palettes
palettedatadir = $(gimpdatadir)/palettes
palettedata_DATA = \
......@@ -40,3 +42,5 @@ palettedata_DATA = \
Volcano.gpl \
Warm_Colors.gpl \
Web.gpl
EXTRA_DIST = $(palettedata_DATA)
## Process this file with automake to produce Makefile.in
patterndatadir = $(gimpdatadir)/patterns
patterndata_DATA = \
......@@ -57,3 +59,5 @@ patterndata_DATA = \
wood3.pat \
wood4.pat \
wood5.pat
EXTRA_DIST = $(patterndata_DATA)
......@@ -181,12 +181,5 @@ libgimpui_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
libgimpui_1_3_la_LIBADD = $(GTK_LIBS)
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimp/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=libgimp/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -73,12 +73,5 @@ libgimpbase_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
libgimpbase_1_3_la_LIBADD = $(GLIB_LIBS)
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimpcolor/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=libgimpcolor/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -57,12 +57,5 @@ libgimpcolor_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
libgimpcolor_1_3_la_LIBADD = $(GLIB_LIBS) -lm
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimpcolor/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=libgimpcolor/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -48,12 +48,5 @@ libgimpmath_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
libgimpmath_1_3_la_LIBADD = $(GLIB_LIBS) -lm
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimpmath/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=libgimpmath/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -85,12 +85,5 @@ libgimpwidgets_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
libgimpwidgets_1_3_la_LIBADD = $(GLIB_LIBS) -lm
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimpwidgets/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=libgimpwidgets/$@ CONFIG_HEADERS= $(SHELL) ./config.status
# Makefile.am for gimp/m4macros
installed_m4= gimp-1.4.m4
installed_m4 = gimp-1.4.m4
EXTRA_DIST=$(installed_m4)
EXTRA_DIST = $(installed_m4)
m4datadir = $(datadir)/aclocal
m4data_DATA = $(installed_m4)
......@@ -27,7 +27,6 @@ EXTRA_DIST = @STRIP_BEGIN@ \
folder.xpm \
last.xpm \
locked.xbm \
navbutton.xpm \
next.xpm \
no.xpm \
path.xbm \
......@@ -37,8 +36,6 @@ EXTRA_DIST = @STRIP_BEGIN@ \
pennorm.xpm \
play.xpm \
prev.xpm \
qmasksel.xpm \
qmasknosel.xpm \
question.xpm \
swap.xpm \
update.xpm \
......@@ -47,10 +44,3 @@ EXTRA_DIST = @STRIP_BEGIN@ \
wilber3.xpm \
yes.xpm \
@STRIP_END@
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -43,6 +43,7 @@ SUBDIRS = \
gfig \
gflare \
gfli \
$(GIMP_PERL) \
gimpressionist \
$(HELPBROWSER) \
ifscompose \
......@@ -59,7 +60,6 @@ SUBDIRS = \
plugin-helper \
common
## $(GIMP_PERL) \
## gap \
## gdyntext \
......
......@@ -134,10 +134,3 @@ CLEANFILES += $(noinst_DATA)
gimp-stock-pixbufs.h: $(STOCK_IMAGES) $(STOCK_TOOL_IMAGES)
gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) >$(srcdir)/gimp-stock-pixbufs.h
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -29,10 +29,3 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
themedata_DATA = $(STOCK_IMAGES)
EXTRA_DIST = $(themedata_DATA)
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -46,10 +46,3 @@ STOCK_TOOL_IMAGES = @STRIP_BEGIN@ \
themedata_DATA = $(STOCK_TOOL_IMAGES)
EXTRA_DIST = $(themedata_DATA)
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
## Process this file with automake to produce Makefile.in
SUBDIRS = Default
.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
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