gimp r26494 - in trunk: . plug-ins plug-ins/bmp plug-ins/common plug-ins/faxg3 plug-ins/file-bmp plug-ins/file-faxg3 plug-ins/file-fits plug-ins/file-fli plug-ins/file-ico plug-ins/file-jpeg plug-ins/file-psd plug-ins/file-sgi plug-ins/file-uri plug-ins/file-xjt plug-ins/fits plug-ins/fli plug-ins/ico plug-ins/jpeg plug-ins/psd plug-ins/sgi plug-ins/uri plug-ins/xjt
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26494 - in trunk: . plug-ins plug-ins/bmp plug-ins/common plug-ins/faxg3 plug-ins/file-bmp plug-ins/file-faxg3 plug-ins/file-fits plug-ins/file-fli plug-ins/file-ico plug-ins/file-jpeg plug-ins/file-psd plug-ins/file-sgi plug-ins/file-uri plug-ins/file-xjt plug-ins/fits plug-ins/fli plug-ins/ico plug-ins/jpeg plug-ins/psd plug-ins/sgi plug-ins/uri plug-ins/xjt
- Date: Mon, 11 Aug 2008 10:06:13 +0000 (UTC)
Author: mitch
Date: Mon Aug 11 10:06:13 2008
New Revision: 26494
URL: http://svn.gnome.org/viewvc/gimp?rev=26494&view=rev
Log:
2008-08-11 Michael Natterer <mitch gimp org>
* plug-ins/bmp/*
* plug-ins/faxg3/*
* plug-ins/fits/*
* plug-ins/fli/*
* plug-ins/ico/*
* plug-ins/jpeg/*
* plug-ins/psd/*
* plug-ins/sgi/*
* plug-ins/uri/*
* plug-ins/xjt/*: removed these...
* plug-ins/file-bmp/*
* plug-ins/file-faxg3/*
* plug-ins/file-fits/*
* plug-ins/file-fli/*
* plug-ins/file-ico/*
* plug-ins/file-jpeg/*
* plug-ins/file-psd/*
* plug-ins/file-sgi/*
* plug-ins/file-uri/*
* plug-ins/file-xjt/*: and moved them here. Changed executable
names to "file-foo".
* plug-ins/Makefile.am: changed accordingly.
* plug-ins/common/*: rename all file plug-ins to file-foo.c. Get
rid of the names "poppler" and "postscript" and call them
"file-pdf" and "file-ps" because the conflict with standard
autofoo targets is gone.
* plug-ins/common/plugin-defs.pl: changed accordingly.
* plug-ins/common/mkgen.pl: make sure cflags variables are named
"PLUG_IN_NAME_CFLAGS" and not "PLUG-IN-NAME_CFLAGS"
* plug-ins/common/Makefile.am: regenerated.
* configure.in: change folders and variable names to match above
changes.
Added:
trunk/plug-ins/common/file-aa.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/aa.c
trunk/plug-ins/common/file-cel.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/cel.c
trunk/plug-ins/common/file-csource.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/csource.c
trunk/plug-ins/common/file-desktop-link.c (contents, props changed)
- copied, changed from r26489, /trunk/plug-ins/common/desktop-link.c
trunk/plug-ins/common/file-dicom.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/dicom.c
trunk/plug-ins/common/file-gbr.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/gbr.c
trunk/plug-ins/common/file-gif-load.c (props changed)
- copied unchanged from r26446, /trunk/plug-ins/common/gif-load.c
trunk/plug-ins/common/file-gif-save.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/gif-save.c
trunk/plug-ins/common/file-gih.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/gih.c
trunk/plug-ins/common/file-glob.c (props changed)
- copied unchanged from r26446, /trunk/plug-ins/common/glob.c
trunk/plug-ins/common/file-header.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/header.c
trunk/plug-ins/common/file-html-table.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/html-table.c
trunk/plug-ins/common/file-mng.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/mng.c
trunk/plug-ins/common/file-pat.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/pat.c
trunk/plug-ins/common/file-pcx.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/pcx.c
trunk/plug-ins/common/file-pdf.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/poppler.c
trunk/plug-ins/common/file-pix.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/pix.c
trunk/plug-ins/common/file-png.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/png.c
trunk/plug-ins/common/file-pnm.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/pnm.c
trunk/plug-ins/common/file-ps.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/postscript.c
trunk/plug-ins/common/file-psp.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/psp.c
trunk/plug-ins/common/file-raw.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/raw.c
trunk/plug-ins/common/file-sunras.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/sunras.c
trunk/plug-ins/common/file-svg.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/svg.c
trunk/plug-ins/common/file-tga.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/tga.c
trunk/plug-ins/common/file-tiff-load.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/tiff-load.c
trunk/plug-ins/common/file-tiff-save.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/tiff-save.c
trunk/plug-ins/common/file-wmf.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/wmf.c
trunk/plug-ins/common/file-xbm.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/xbm.c
trunk/plug-ins/common/file-xpm.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/xpm.c
trunk/plug-ins/common/file-xwd.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/common/xwd.c
trunk/plug-ins/file-bmp/ (props changed)
- copied from r26446, /trunk/plug-ins/bmp/
trunk/plug-ins/file-bmp/bmp-read.c (props changed)
- copied unchanged from r26446, /trunk/plug-ins/bmp/bmp-read.c
trunk/plug-ins/file-bmp/bmp-write.c (props changed)
- copied unchanged from r26446, /trunk/plug-ins/bmp/bmp-write.c
trunk/plug-ins/file-bmp/bmp.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/bmp/bmp.c
trunk/plug-ins/file-bmp/bmp.h (props changed)
- copied unchanged from r26446, /trunk/plug-ins/bmp/bmp.h
trunk/plug-ins/file-faxg3/ (props changed)
- copied from r26446, /trunk/plug-ins/faxg3/
trunk/plug-ins/file-fits/ (props changed)
- copied from r26446, /trunk/plug-ins/fits/
trunk/plug-ins/file-fits/fits-io.c (props changed)
- copied unchanged from r26446, /trunk/plug-ins/fits/fits-io.c
trunk/plug-ins/file-fits/fits-io.h (props changed)
- copied unchanged from r26446, /trunk/plug-ins/fits/fits-io.h
trunk/plug-ins/file-fits/fits.c (contents, props changed)
- copied, changed from r26446, /trunk/plug-ins/fits/fits.c
trunk/plug-ins/file-fli/ (props changed)
- copied from r26446, /trunk/plug-ins/fli/
trunk/plug-ins/file-ico/ (props changed)
- copied from r26446, /trunk/plug-ins/ico/
trunk/plug-ins/file-jpeg/ (props changed)
- copied from r26446, /trunk/plug-ins/jpeg/
trunk/plug-ins/file-psd/ (props changed)
- copied from r26446, /trunk/plug-ins/psd/
trunk/plug-ins/file-sgi/ (props changed)
- copied from r26446, /trunk/plug-ins/sgi/
trunk/plug-ins/file-uri/ (props changed)
- copied from r26446, /trunk/plug-ins/uri/
trunk/plug-ins/file-xjt/ (props changed)
- copied from r26446, /trunk/plug-ins/xjt/
Removed:
trunk/plug-ins/bmp/
trunk/plug-ins/common/aa.c
trunk/plug-ins/common/cel.c
trunk/plug-ins/common/csource.c
trunk/plug-ins/common/desktop-link.c
trunk/plug-ins/common/dicom.c
trunk/plug-ins/common/gbr.c
trunk/plug-ins/common/gif-load.c
trunk/plug-ins/common/gif-save.c
trunk/plug-ins/common/gih.c
trunk/plug-ins/common/glob.c
trunk/plug-ins/common/header.c
trunk/plug-ins/common/html-table.c
trunk/plug-ins/common/mng.c
trunk/plug-ins/common/pat.c
trunk/plug-ins/common/pcx.c
trunk/plug-ins/common/pix.c
trunk/plug-ins/common/png.c
trunk/plug-ins/common/pnm.c
trunk/plug-ins/common/poppler.c
trunk/plug-ins/common/postscript.c
trunk/plug-ins/common/psp.c
trunk/plug-ins/common/raw.c
trunk/plug-ins/common/sunras.c
trunk/plug-ins/common/svg.c
trunk/plug-ins/common/tga.c
trunk/plug-ins/common/tiff-load.c
trunk/plug-ins/common/tiff-save.c
trunk/plug-ins/common/wmf.c
trunk/plug-ins/common/xbm.c
trunk/plug-ins/common/xpm.c
trunk/plug-ins/common/xwd.c
trunk/plug-ins/faxg3/
trunk/plug-ins/fits/
trunk/plug-ins/fli/
trunk/plug-ins/ico/
trunk/plug-ins/jpeg/
trunk/plug-ins/psd/
trunk/plug-ins/sgi/
trunk/plug-ins/uri/
trunk/plug-ins/xjt/
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/plug-ins/Makefile.am
trunk/plug-ins/common/ (props changed)
trunk/plug-ins/common/Makefile.am
trunk/plug-ins/common/mkgen.pl
trunk/plug-ins/common/plugin-defs.pl
trunk/plug-ins/file-bmp/Makefile.am
trunk/plug-ins/file-faxg3/Makefile.am
trunk/plug-ins/file-fits/Makefile.am
trunk/plug-ins/file-fli/Makefile.am
trunk/plug-ins/file-fli/fli-gimp.c
trunk/plug-ins/file-ico/Makefile.am
trunk/plug-ins/file-ico/ico-save.c
trunk/plug-ins/file-jpeg/Makefile.am
trunk/plug-ins/file-jpeg/jpeg.h
trunk/plug-ins/file-psd/Makefile.am
trunk/plug-ins/file-psd/psd-save.c
trunk/plug-ins/file-psd/psd.h
trunk/plug-ins/file-sgi/Makefile.am
trunk/plug-ins/file-sgi/sgi.c
trunk/plug-ins/file-uri/Makefile.am
trunk/plug-ins/file-uri/uri.c
trunk/plug-ins/file-xjt/Makefile.am
trunk/plug-ins/file-xjt/xjt.c
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Aug 11 10:06:13 2008
@@ -998,15 +998,15 @@
have_libtiff=yes
AC_CHECK_LIB(tiff, TIFFReadScanline,
[AC_CHECK_HEADER(tiffio.h,
- TIFF_LOAD='tiff-load$(EXEEXT)'; TIFF_SAVE='tiff-save$(EXEEXT)'; LIBTIFF='-ltiff',
+ FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff',
[have_libtiff="no (TIFF header files not found)"])],
[AC_CHECK_LIB(tiff, TIFFWriteScanline,
[AC_CHECK_HEADER(tiffio.h,
- TIFF_LOAD='tiff-load$(EXEEXT)'; TIFF_SAVE='tiff-save$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
+ FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
[have_libtiff="no (TIFF header files not found)"])],
[AC_CHECK_LIB(tiff34, TIFFFlushData,
[AC_CHECK_HEADER(tiffio.h,
- TIFF_LOAD='tiff-load$(EXEEXT)'; TIFF_SAVE='tiff-save$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
+ FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
[have_libtiff="no (TIFF header files not found)"])],
[have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
fi
@@ -1021,8 +1021,8 @@
MIME_TYPES="$MIME_TYPES;image/tiff"
fi
-AC_SUBST(TIFF_LOAD)
-AC_SUBST(TIFF_SAVE)
+AC_SUBST(FILE_TIFF_LOAD)
+AC_SUBST(FILE_TIFF_SAVE)
AC_SUBST(LIBTIFF)
@@ -1094,7 +1094,7 @@
if test -z "$LIBZ"; then
AC_CHECK_LIB(z, gzsetparams,
[AC_CHECK_HEADER(zlib.h,
- PSP='psp$(EXEEXT)'; LIBZ='-lz',
+ FILE_PSP='file-psp$(EXEEXT)'; LIBZ='-lz',
[have_zlib="no (ZLIB header files not found)"])],
[have_zlib="no (ZLIB library not found)"])
fi
@@ -1103,8 +1103,8 @@
MIME_TYPES="$MIME_TYPES;image/x-psd"
fi
+AC_SUBST(FILE_PSP)
AC_SUBST(LIBZ)
-AC_SUBST(PSP)
##################
@@ -1116,7 +1116,7 @@
if test "x$with_libpng" != xno; then
have_libpng=yes
PKG_CHECK_MODULES(PNG, libpng,
- PNG='png$(EXEEXT)'
+ FILE_PNG='file-png$(EXEEXT)'
LIBPNG="$PNG_LIBS",
[have_libpng="no (libpng not found)"
AC_MSG_ERROR([
@@ -1128,7 +1128,7 @@
MIME_TYPES="$MIME_TYPES;image/png;image/x-icon"
fi
-AC_SUBST(PNG)
+AC_SUBST(FILE_PNG)
AC_SUBST(LIBPNG)
AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = xyes)
@@ -1147,13 +1147,13 @@
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
[have_libmng="no (MNG library not found)"], -lz -lm)
if test "$mng_ok" = yes; then
- MNG='mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
+ FILE_MNG='file-mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
else
have_libmng="no (MNG header file not found)"
fi
fi
-AC_SUBST(MNG)
+AC_SUBST(FILE_MNG)
AC_SUBST(LIBMNG)
@@ -1187,12 +1187,12 @@
have_libaa=yes
AC_CHECK_LIB(aa, aa_printf,
[AC_CHECK_HEADER(aalib.h,
- AA='aa$(EXEEXT)'; LIBAA='-laa',
+ FILE_AA='file-aa$(EXEEXT)'; LIBAA='-laa',
[have_libaa="no (AA header file not found)"])],
[have_libaa="no (AA library not found)"])
fi
-AC_SUBST(AA)
+AC_SUBST(FILE_AA)
AC_SUBST(LIBAA)
@@ -1211,7 +1211,7 @@
if test -z "$LIBXPM"; then
AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
[AC_CHECK_HEADER(X11/xpm.h,
- XPM='xpm$(EXEEXT)'; LIBXPM="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
+ FILE_XPM='file-xpm$(EXEEXT)'; LIBXPM="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
[have_libxpm="no (XPM header file not found)"])],
[have_libxpm="no (XPM library not found)"], $X_PRE_LIBS $lib_X11)
fi
@@ -1222,7 +1222,7 @@
MIME_TYPES="$MIME_TYPES;image/x-xpixmap"
fi
-AC_SUBST(XPM)
+AC_SUBST(FILE_XPM)
AC_SUBST(LIBXPM)
@@ -1263,7 +1263,7 @@
if test "x$with_librsvg" != xno; then
have_librsvg=yes
PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
- SVG='svg$(EXEEXT)'
+ FILE_SVG='file-svg$(EXEEXT)'
LIBSVG=$SVG_LIBS,
have_librsvg="no (librsvg not found)")
else
@@ -1274,7 +1274,7 @@
MIME_TYPES="$MIME_TYPES;image/svg+xml"
fi
-AC_SUBST(SVG)
+AC_SUBST(FILE_SVG)
AC_SUBST(LIBSVG)
@@ -1301,7 +1301,7 @@
if test "x$with_poppler" != xno; then
PKG_CHECK_MODULES(POPPLER,
poppler-glib >= poppler_required_version gthread-2.0,
- POPPLER='poppler$(EXEEXT)'
+ FILE_PDF='file-pdf$(EXEEXT)'
LIBPOPPLER=$POPPLER_LIBS
AC_DEFINE(HAVE_POPPLER, 1, [Define to 1 if libpoppler is available])
have_poppler=yes,
@@ -1310,7 +1310,7 @@
have_poppler="Using PostScript plug-in (libpoppler support disabled)"
fi
-AC_SUBST(POPPLER)
+AC_SUBST(FILE_PDF)
AC_SUBST(LIBPOPPLER)
@@ -1407,7 +1407,7 @@
wmf_version=`$WMF_CONFIG --version`
if expr $wmf_version \>= wmf_required_version >/dev/null; then
AC_MSG_RESULT([yes (version $wmf_version)])
- WMF='wmf$(EXEEXT)'
+ FILE_WMF='file-wmf$(EXEEXT)'
LIBWMF=`$WMF_CONFIG --libs`
WMF_CFLAGS=`$WMF_CONFIG --cflags`
else
@@ -1421,9 +1421,9 @@
MIME_TYPES="$MIME_TYPES;image/x-wmf"
fi
-AC_SUBST(LIBWMF)
+AC_SUBST(FILE_WMF)
AC_SUBST(WMF_CFLAGS)
-AC_SUBST(WMF)
+AC_SUBST(LIBWMF)
################
@@ -1984,32 +1984,35 @@
app/widgets/Makefile
app/xcf/Makefile
plug-ins/Makefile
-plug-ins/bmp/Makefile
plug-ins/color-rotate/Makefile
plug-ins/color-rotate/images/Makefile
-plug-ins/common/Makefile
-plug-ins/faxg3/Makefile
-plug-ins/fits/Makefile
+plug-ins/file-bmp/Makefile
+plug-ins/file-faxg3/Makefile
+plug-ins/file-fits/Makefile
+plug-ins/file-fli/Makefile
+plug-ins/file-ico/Makefile
+plug-ins/file-jpeg/Makefile
+plug-ins/file-psd/Makefile
+plug-ins/file-sgi/Makefile
+plug-ins/file-uri/Makefile
+plug-ins/file-xjt/Makefile
plug-ins/flame/Makefile
-plug-ins/fli/Makefile
plug-ins/fractal-explorer/Makefile
plug-ins/fractal-explorer/examples/Makefile
plug-ins/gfig/Makefile
plug-ins/gfig/gfig-examples/Makefile
plug-ins/gfig/images/Makefile
-plug-ins/gradient-flare/Makefile
-plug-ins/gradient-flare/flares/Makefile
plug-ins/gimpressionist/Brushes/Makefile
plug-ins/gimpressionist/Makefile
plug-ins/gimpressionist/Paper/Makefile
plug-ins/gimpressionist/Presets/Makefile
+plug-ins/gradient-flare/Makefile
+plug-ins/gradient-flare/flares/Makefile
plug-ins/help-browser/Makefile
plug-ins/help/Makefile
-plug-ins/ico/Makefile
plug-ins/ifs-compose/Makefile
plug-ins/imagemap/Makefile
plug-ins/imagemap/images/Makefile
-plug-ins/jpeg/Makefile
plug-ins/lighting/Makefile
plug-ins/lighting/images/Makefile
plug-ins/map-object/Makefile
@@ -2017,7 +2020,6 @@
plug-ins/metadata/Makefile
plug-ins/pagecurl/Makefile
plug-ins/print/Makefile
-plug-ins/psd/Makefile
plug-ins/pygimp/Makefile
plug-ins/pygimp/plug-ins/Makefile
plug-ins/script-fu/Makefile
@@ -2027,11 +2029,9 @@
plug-ins/script-fu/scripts/images/Makefile
plug-ins/script-fu/tinyscheme/Makefile
plug-ins/selection-to-path/Makefile
-plug-ins/sgi/Makefile
plug-ins/twain/Makefile
-plug-ins/uri/Makefile
plug-ins/win-snap/Makefile
-plug-ins/xjt/Makefile
+plug-ins/common/Makefile
modules/Makefile
devel-docs/Makefile
devel-docs/app/Makefile
Modified: trunk/plug-ins/Makefile.am
==============================================================================
--- trunk/plug-ins/Makefile.am (original)
+++ trunk/plug-ins/Makefile.am Mon Aug 11 10:06:13 2008
@@ -9,7 +9,7 @@
endif
if BUILD_JPEG
-jpeg = jpeg
+file_jpeg = file-jpeg
endif
if BUILD_PRINT
@@ -29,54 +29,54 @@
endif
if HAVE_PNG
-ico = ico
+file_ico = file-ico
endif
if OS_WIN32
twain = twain
win_snap = win-snap
if HAVE_LIBCURL
-uri = uri
+file_uri = file-uri
endif
else
-uri = uri
+file_uri = file-uri
endif
if BUILD_XJT
-xjt = xjt
+file_xjt = file-xjt
endif
SUBDIRS = \
$(script_fu) \
$(pygimp) \
- bmp \
color-rotate \
- faxg3 \
- fits \
+ file-bmp \
+ file-faxg3 \
+ file-fits \
+ file-fli \
+ $(file_ico) \
+ $(file_jpeg) \
+ file-psd \
+ file-sgi \
+ $(file_uri) \
+ $(file_xjt) \
flame \
- fli \
fractal-explorer \
gfig \
gimpressionist \
gradient-flare \
help \
$(help_browser) \
- $(ico) \
ifs-compose \
imagemap \
- $(jpeg) \
lighting \
map-object \
maze \
metadata \
pagecurl \
$(print) \
- psd \
selection-to-path \
- sgi \
$(twain) \
- $(uri) \
$(win_snap) \
- $(xjt) \
common
Modified: trunk/plug-ins/common/Makefile.am
==============================================================================
--- trunk/plug-ins/common/Makefile.am (original)
+++ trunk/plug-ins/common/Makefile.am Mon Aug 11 10:06:13 2008
@@ -36,7 +36,6 @@
-I$(includedir)
libexec_PROGRAMS = \
- $(AA) \
alien-map \
align-layers \
animation-optimize \
@@ -51,7 +50,6 @@
border-average \
bump-map \
cartoon \
- cel \
channel-mixer \
checkerboard \
cml-explorer \
@@ -70,16 +68,13 @@
convolution-matrix \
crop-auto \
crop-zealous \
- csource \
cubism \
curve-bend \
decompose \
deinterlace \
depth-merge \
- desktop-link \
despeckle \
destripe \
- dicom \
diffraction \
displace \
edge \
@@ -89,22 +84,46 @@
edge-sobel \
emboss \
engrave \
+ $(FILE_AA) \
+ file-cel \
+ file-csource \
+ file-desktop-link \
+ file-dicom \
+ file-gbr \
+ file-gif-load \
+ file-gif-save \
+ file-gih \
+ file-glob \
+ file-header \
+ file-html-table \
+ $(FILE_MNG) \
+ file-pat \
+ file-pcx \
+ $(FILE_PDF) \
+ file-pix \
+ $(FILE_PNG) \
+ file-pnm \
+ file-ps \
+ $(FILE_PSP) \
+ file-raw \
+ file-sunras \
+ $(FILE_SVG) \
+ file-tga \
+ $(FILE_TIFF_LOAD) \
+ $(FILE_TIFF_SAVE) \
+ $(FILE_WMF) \
+ file-xbm \
+ $(FILE_XPM) \
+ file-xwd \
film \
filter-pack \
fractal-trace \
- gbr \
gee \
gee-zoom \
- gif-load \
- gif-save \
- gih \
- glob \
gradient-map \
grid \
guillotine \
- header \
hot \
- html-table \
illusion \
iwarp \
jigsaw \
@@ -114,7 +133,6 @@
lens-flare \
$(MAIL) \
max-rgb \
- $(MNG) \
mosaic \
newsprint \
nl-filter \
@@ -125,22 +143,13 @@
noise-spread \
nova \
oilify \
- pat \
- pcx \
photocopy \
- pix \
pixelize \
plasma \
plugin-browser \
- $(PNG) \
- pnm \
polar-coords \
- $(POPPLER) \
- postscript \
procedure-browser \
- $(PSP) \
qbist \
- raw \
red-eye-removal \
ripple \
rotate \
@@ -154,12 +163,7 @@
softglow \
sparkle \
sphere-designer \
- sunras \
- $(SVG) \
- tga \
threshold-alpha \
- $(TIFF_LOAD) \
- $(TIFF_SAVE) \
tile \
tile-glass \
tile-paper \
@@ -175,26 +179,22 @@
waves \
web-browser \
whirl-pinch \
- wind \
- $(WMF) \
- xbm \
- $(XPM) \
- xwd
+ wind
EXTRA_PROGRAMS = \
- aa \
+ file-aa \
+ file-mng \
+ file-pdf \
+ file-png \
+ file-psp \
+ file-svg \
+ file-tiff-load \
+ file-tiff-save \
+ file-wmf \
+ file-xpm \
lcms \
mail \
- mng \
- png \
- poppler \
- psp \
- screenshot \
- svg \
- tiff-load \
- tiff-save \
- wmf \
- xpm
+ screenshot
install-%: %
@$(NORMAL_INSTALL)
@@ -208,23 +208,6 @@
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
else :; fi
-aa_SOURCES = \
- aa.c
-
-aa_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(LIBAA) \
- $(RT_LIBS) \
- $(INTLLIBS)
-
alien_map_SOURCES = \
alien-map.c
@@ -442,22 +425,6 @@
$(RT_LIBS) \
$(INTLLIBS)
-cel_SOURCES = \
- cel.c
-
-cel_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS)
-
channel_mixer_SOURCES = \
channel-mixer.c
@@ -728,22 +695,6 @@
$(RT_LIBS) \
$(INTLLIBS)
-csource_SOURCES = \
- csource.c
-
-csource_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS)
-
cubism_SOURCES = \
cubism.c
@@ -824,19 +775,6 @@
$(RT_LIBS) \
$(INTLLIBS)
-desktop_link_SOURCES = \
- desktop-link.c
-
-desktop_link_LDADD = \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GLIB_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS)
-
despeckle_SOURCES = \
despeckle.c
@@ -869,22 +807,6 @@
$(RT_LIBS) \
$(INTLLIBS)
-dicom_SOURCES = \
- dicom.c
-
-dicom_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS)
-
diffraction_SOURCES = \
diffraction.c
@@ -1026,10 +948,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-film_SOURCES = \
- film.c
+file_aa_SOURCES = \
+ file-aa.c
-film_LDADD = \
+file_aa_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1039,13 +961,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBAA) \
$(RT_LIBS) \
$(INTLLIBS)
-filter_pack_SOURCES = \
- filter-pack.c
+file_cel_SOURCES = \
+ file-cel.c
-filter_pack_LDADD = \
+file_cel_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1058,10 +981,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-fractal_trace_SOURCES = \
- fractal-trace.c
+file_csource_SOURCES = \
+ file-csource.c
-fractal_trace_LDADD = \
+file_csource_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1074,26 +997,23 @@
$(RT_LIBS) \
$(INTLLIBS)
-gbr_SOURCES = \
- gbr.c
+file_desktop_link_SOURCES = \
+ file-desktop-link.c
-gbr_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
+file_desktop_link_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GTK_LIBS) \
+ $(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-gee_SOURCES = \
- gee.c
+file_dicom_SOURCES = \
+ file-dicom.c
-gee_LDADD = \
+file_dicom_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1106,10 +1026,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-gee_zoom_SOURCES = \
- gee-zoom.c
+file_gbr_SOURCES = \
+ file-gbr.c
-gee_zoom_LDADD = \
+file_gbr_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1122,10 +1042,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-gif_load_SOURCES = \
- gif-load.c
+file_gif_load_SOURCES = \
+ file-gif-load.c
-gif_load_LDADD = \
+file_gif_load_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
@@ -1135,10 +1055,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-gif_save_SOURCES = \
- gif-save.c
+file_gif_save_SOURCES = \
+ file-gif-save.c
-gif_save_LDADD = \
+file_gif_save_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1151,10 +1071,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-gih_SOURCES = \
- gih.c
+file_gih_SOURCES = \
+ file-gih.c
-gih_LDADD = \
+file_gih_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1167,10 +1087,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-glob_SOURCES = \
- glob.c
+file_glob_SOURCES = \
+ file-glob.c
-glob_LDADD = \
+file_glob_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
@@ -1180,23 +1100,26 @@
$(RT_LIBS) \
$(INTLLIBS)
-gradient_map_SOURCES = \
- gradient-map.c
+file_header_SOURCES = \
+ file-header.c
-gradient_map_LDADD = \
+file_header_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GLIB_LIBS) \
+ $(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-grid_SOURCES = \
- grid.c
+file_html_table_SOURCES = \
+ file-html-table.c
-grid_LDADD = \
+file_html_table_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1209,23 +1132,27 @@
$(RT_LIBS) \
$(INTLLIBS)
-guillotine_SOURCES = \
- guillotine.c
+file_mng_SOURCES = \
+ file-mng.c
-guillotine_LDADD = \
+file_mng_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBMNG) \
$(RT_LIBS) \
$(INTLLIBS)
-header_SOURCES = \
- header.c
+file_pat_SOURCES = \
+ file-pat.c
-header_LDADD = \
+file_pat_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1238,10 +1165,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-hot_SOURCES = \
- hot.c
+file_pcx_SOURCES = \
+ file-pcx.c
-hot_LDADD = \
+file_pcx_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1254,10 +1181,12 @@
$(RT_LIBS) \
$(INTLLIBS)
-html_table_SOURCES = \
- html-table.c
+file_pdf_CFLAGS = $(POPPLER_CFLAGS)
+
+file_pdf_SOURCES = \
+ file-pdf.c
-html_table_LDADD = \
+file_pdf_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1267,13 +1196,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBPOPPLER) \
$(RT_LIBS) \
$(INTLLIBS)
-illusion_SOURCES = \
- illusion.c
+file_pix_SOURCES = \
+ file-pix.c
-illusion_LDADD = \
+file_pix_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1286,10 +1216,12 @@
$(RT_LIBS) \
$(INTLLIBS)
-iwarp_SOURCES = \
- iwarp.c
+file_png_CFLAGS = $(PNG_CFLAGS)
-iwarp_LDADD = \
+file_png_SOURCES = \
+ file-png.c
+
+file_png_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1299,13 +1231,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBPNG) \
$(RT_LIBS) \
$(INTLLIBS)
-jigsaw_SOURCES = \
- jigsaw.c
+file_pnm_SOURCES = \
+ file-pnm.c
-jigsaw_LDADD = \
+file_pnm_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1318,10 +1251,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-lcms_SOURCES = \
- lcms.c
+file_ps_SOURCES = \
+ file-ps.c
-lcms_LDADD = \
+file_ps_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1331,14 +1264,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBLCMS) \
$(RT_LIBS) \
$(INTLLIBS)
-lens_apply_SOURCES = \
- lens-apply.c
+file_psp_SOURCES = \
+ file-psp.c
-lens_apply_LDADD = \
+file_psp_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1348,13 +1280,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBZ) \
$(RT_LIBS) \
$(INTLLIBS)
-lens_distortion_SOURCES = \
- lens-distortion.c
+file_raw_SOURCES = \
+ file-raw.c
-lens_distortion_LDADD = \
+file_raw_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1367,10 +1300,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-lens_flare_SOURCES = \
- lens-flare.c
+file_sunras_SOURCES = \
+ file-sunras.c
-lens_flare_LDADD = \
+file_sunras_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1383,10 +1316,12 @@
$(RT_LIBS) \
$(INTLLIBS)
-mail_SOURCES = \
- mail.c
+file_svg_CFLAGS = $(SVG_CFLAGS)
-mail_LDADD = \
+file_svg_SOURCES = \
+ file-svg.c
+
+file_svg_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1396,14 +1331,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBMAIL) \
+ $(LIBSVG) \
$(RT_LIBS) \
$(INTLLIBS)
-max_rgb_SOURCES = \
- max-rgb.c
+file_tga_SOURCES = \
+ file-tga.c
-max_rgb_LDADD = \
+file_tga_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1416,10 +1351,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-mng_SOURCES = \
- mng.c
+file_tiff_load_SOURCES = \
+ file-tiff-load.c
-mng_LDADD = \
+file_tiff_load_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1429,14 +1364,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBMNG) \
+ $(LIBTIFF) \
$(RT_LIBS) \
$(INTLLIBS)
-mosaic_SOURCES = \
- mosaic.c
+file_tiff_save_SOURCES = \
+ file-tiff-save.c
-mosaic_LDADD = \
+file_tiff_save_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1446,13 +1381,16 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBTIFF) \
$(RT_LIBS) \
$(INTLLIBS)
-newsprint_SOURCES = \
- newsprint.c
+file_wmf_CFLAGS = $(WMF_CFLAGS)
-newsprint_LDADD = \
+file_wmf_SOURCES = \
+ file-wmf.c
+
+file_wmf_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1462,13 +1400,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBWMF) \
$(RT_LIBS) \
$(INTLLIBS)
-nl_filter_SOURCES = \
- nl-filter.c
+file_xbm_SOURCES = \
+ file-xbm.c
-nl_filter_LDADD = \
+file_xbm_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1481,10 +1420,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-noise_hsv_SOURCES = \
- noise-hsv.c
+file_xpm_SOURCES = \
+ file-xpm.c
-noise_hsv_LDADD = \
+file_xpm_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1494,13 +1433,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBXPM) \
$(RT_LIBS) \
$(INTLLIBS)
-noise_randomize_SOURCES = \
- noise-randomize.c
+file_xwd_SOURCES = \
+ file-xwd.c
-noise_randomize_LDADD = \
+file_xwd_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1513,10 +1453,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-noise_rgb_SOURCES = \
- noise-rgb.c
+film_SOURCES = \
+ film.c
-noise_rgb_LDADD = \
+film_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1529,10 +1469,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-noise_solid_SOURCES = \
- noise-solid.c
+filter_pack_SOURCES = \
+ filter-pack.c
-noise_solid_LDADD = \
+filter_pack_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1545,10 +1485,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-noise_spread_SOURCES = \
- noise-spread.c
+fractal_trace_SOURCES = \
+ fractal-trace.c
-noise_spread_LDADD = \
+fractal_trace_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1561,10 +1501,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-nova_SOURCES = \
- nova.c
+gee_SOURCES = \
+ gee.c
-nova_LDADD = \
+gee_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1577,10 +1517,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-oilify_SOURCES = \
- oilify.c
+gee_zoom_SOURCES = \
+ gee-zoom.c
-oilify_LDADD = \
+gee_zoom_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1593,26 +1533,23 @@
$(RT_LIBS) \
$(INTLLIBS)
-pat_SOURCES = \
- pat.c
+gradient_map_SOURCES = \
+ gradient-map.c
-pat_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
+gradient_map_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GTK_LIBS) \
+ $(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-pcx_SOURCES = \
- pcx.c
+grid_SOURCES = \
+ grid.c
-pcx_LDADD = \
+grid_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1625,26 +1562,23 @@
$(RT_LIBS) \
$(INTLLIBS)
-photocopy_SOURCES = \
- photocopy.c
+guillotine_SOURCES = \
+ guillotine.c
-photocopy_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
+guillotine_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GTK_LIBS) \
+ $(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-pix_SOURCES = \
- pix.c
+hot_SOURCES = \
+ hot.c
-pix_LDADD = \
+hot_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1657,10 +1591,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-pixelize_SOURCES = \
- pixelize.c
+illusion_SOURCES = \
+ illusion.c
-pixelize_LDADD = \
+illusion_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1673,10 +1607,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-plasma_SOURCES = \
- plasma.c
+iwarp_SOURCES = \
+ iwarp.c
-plasma_LDADD = \
+iwarp_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1689,10 +1623,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-plugin_browser_SOURCES = \
- plugin-browser.c
+jigsaw_SOURCES = \
+ jigsaw.c
-plugin_browser_LDADD = \
+jigsaw_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1705,12 +1639,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-png_CFLAGS = $(PNG_CFLAGS)
-
-png_SOURCES = \
- png.c
+lcms_SOURCES = \
+ lcms.c
-png_LDADD = \
+lcms_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1720,14 +1652,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBPNG) \
+ $(LIBLCMS) \
$(RT_LIBS) \
$(INTLLIBS)
-pnm_SOURCES = \
- pnm.c
+lens_apply_SOURCES = \
+ lens-apply.c
-pnm_LDADD = \
+lens_apply_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1740,10 +1672,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-polar_coords_SOURCES = \
- polar-coords.c
+lens_distortion_SOURCES = \
+ lens-distortion.c
-polar_coords_LDADD = \
+lens_distortion_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1756,12 +1688,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-poppler_CFLAGS = $(POPPLER_CFLAGS)
-
-poppler_SOURCES = \
- poppler.c
+lens_flare_SOURCES = \
+ lens-flare.c
-poppler_LDADD = \
+lens_flare_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1771,14 +1701,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBPOPPLER) \
$(RT_LIBS) \
$(INTLLIBS)
-postscript_SOURCES = \
- postscript.c
+mail_SOURCES = \
+ mail.c
-postscript_LDADD = \
+mail_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1788,13 +1717,14 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
+ $(LIBMAIL) \
$(RT_LIBS) \
$(INTLLIBS)
-procedure_browser_SOURCES = \
- procedure-browser.c
+max_rgb_SOURCES = \
+ max-rgb.c
-procedure_browser_LDADD = \
+max_rgb_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1807,10 +1737,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-psp_SOURCES = \
- psp.c
+mosaic_SOURCES = \
+ mosaic.c
-psp_LDADD = \
+mosaic_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1820,14 +1750,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBZ) \
$(RT_LIBS) \
$(INTLLIBS)
-qbist_SOURCES = \
- qbist.c
+newsprint_SOURCES = \
+ newsprint.c
-qbist_LDADD = \
+newsprint_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1840,10 +1769,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-raw_SOURCES = \
- raw.c
+nl_filter_SOURCES = \
+ nl-filter.c
-raw_LDADD = \
+nl_filter_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1856,10 +1785,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-red_eye_removal_SOURCES = \
- red-eye-removal.c
+noise_hsv_SOURCES = \
+ noise-hsv.c
-red_eye_removal_LDADD = \
+noise_hsv_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1872,10 +1801,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-ripple_SOURCES = \
- ripple.c
+noise_randomize_SOURCES = \
+ noise-randomize.c
-ripple_LDADD = \
+noise_randomize_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1888,23 +1817,26 @@
$(RT_LIBS) \
$(INTLLIBS)
-rotate_SOURCES = \
- rotate.c
+noise_rgb_SOURCES = \
+ noise-rgb.c
-rotate_LDADD = \
+noise_rgb_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GLIB_LIBS) \
+ $(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-sample_colorize_SOURCES = \
- sample-colorize.c
+noise_solid_SOURCES = \
+ noise-solid.c
-sample_colorize_LDADD = \
+noise_solid_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1917,12 +1849,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-screenshot_CFLAGS = $(XFIXES_CFLAGS)
-
-screenshot_SOURCES = \
- screenshot.c
+noise_spread_SOURCES = \
+ noise-spread.c
-screenshot_LDADD = \
+noise_spread_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1932,27 +1862,29 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBSCREENSHOT) \
$(RT_LIBS) \
$(INTLLIBS)
-semi_flatten_SOURCES = \
- semi-flatten.c
+nova_SOURCES = \
+ nova.c
-semi_flatten_LDADD = \
+nova_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GLIB_LIBS) \
+ $(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-sharpen_SOURCES = \
- sharpen.c
+oilify_SOURCES = \
+ oilify.c
-sharpen_LDADD = \
+oilify_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1965,10 +1897,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-shift_SOURCES = \
- shift.c
+photocopy_SOURCES = \
+ photocopy.c
-shift_LDADD = \
+photocopy_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1981,10 +1913,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-sinus_SOURCES = \
- sinus.c
+pixelize_SOURCES = \
+ pixelize.c
-sinus_LDADD = \
+pixelize_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -1997,10 +1929,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-smooth_palette_SOURCES = \
- smooth-palette.c
+plasma_SOURCES = \
+ plasma.c
-smooth_palette_LDADD = \
+plasma_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2013,10 +1945,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-softglow_SOURCES = \
- softglow.c
+plugin_browser_SOURCES = \
+ plugin-browser.c
-softglow_LDADD = \
+plugin_browser_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2029,10 +1961,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-sparkle_SOURCES = \
- sparkle.c
+polar_coords_SOURCES = \
+ polar-coords.c
-sparkle_LDADD = \
+polar_coords_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2045,10 +1977,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-sphere_designer_SOURCES = \
- sphere-designer.c
+procedure_browser_SOURCES = \
+ procedure-browser.c
-sphere_designer_LDADD = \
+procedure_browser_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2061,10 +1993,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-sunras_SOURCES = \
- sunras.c
+qbist_SOURCES = \
+ qbist.c
-sunras_LDADD = \
+qbist_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2077,12 +2009,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-svg_CFLAGS = $(SVG_CFLAGS)
-
-svg_SOURCES = \
- svg.c
+red_eye_removal_SOURCES = \
+ red-eye-removal.c
-svg_LDADD = \
+red_eye_removal_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2092,14 +2022,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBSVG) \
$(RT_LIBS) \
$(INTLLIBS)
-tga_SOURCES = \
- tga.c
+ripple_SOURCES = \
+ ripple.c
-tga_LDADD = \
+ripple_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2112,10 +2041,23 @@
$(RT_LIBS) \
$(INTLLIBS)
-threshold_alpha_SOURCES = \
- threshold-alpha.c
+rotate_SOURCES = \
+ rotate.c
-threshold_alpha_LDADD = \
+rotate_LDADD = \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(GLIB_LIBS) \
+ $(RT_LIBS) \
+ $(INTLLIBS)
+
+sample_colorize_SOURCES = \
+ sample-colorize.c
+
+sample_colorize_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2128,10 +2070,12 @@
$(RT_LIBS) \
$(INTLLIBS)
-tiff_load_SOURCES = \
- tiff-load.c
+screenshot_CFLAGS = $(XFIXES_CFLAGS)
-tiff_load_LDADD = \
+screenshot_SOURCES = \
+ screenshot.c
+
+screenshot_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2141,14 +2085,27 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBTIFF) \
+ $(LIBSCREENSHOT) \
+ $(RT_LIBS) \
+ $(INTLLIBS)
+
+semi_flatten_SOURCES = \
+ semi-flatten.c
+
+semi_flatten_LDADD = \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-tiff_save_SOURCES = \
- tiff-save.c
+sharpen_SOURCES = \
+ sharpen.c
-tiff_save_LDADD = \
+sharpen_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2158,14 +2115,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBTIFF) \
$(RT_LIBS) \
$(INTLLIBS)
-tile_SOURCES = \
- tile.c
+shift_SOURCES = \
+ shift.c
-tile_LDADD = \
+shift_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2178,10 +2134,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-tile_glass_SOURCES = \
- tile-glass.c
+sinus_SOURCES = \
+ sinus.c
-tile_glass_LDADD = \
+sinus_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2194,10 +2150,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-tile_paper_SOURCES = \
- tile-paper.c
+smooth_palette_SOURCES = \
+ smooth-palette.c
-tile_paper_LDADD = \
+smooth_palette_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2210,23 +2166,26 @@
$(RT_LIBS) \
$(INTLLIBS)
-tile_seamless_SOURCES = \
- tile-seamless.c
+softglow_SOURCES = \
+ softglow.c
-tile_seamless_LDADD = \
+softglow_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GLIB_LIBS) \
+ $(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-tile_small_SOURCES = \
- tile-small.c
+sparkle_SOURCES = \
+ sparkle.c
-tile_small_LDADD = \
+sparkle_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2239,10 +2198,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-unit_editor_SOURCES = \
- unit-editor.c
+sphere_designer_SOURCES = \
+ sphere-designer.c
-unit_editor_LDADD = \
+sphere_designer_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2255,10 +2214,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-unsharp_mask_SOURCES = \
- unsharp-mask.c
+threshold_alpha_SOURCES = \
+ threshold-alpha.c
-unsharp_mask_LDADD = \
+threshold_alpha_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2271,23 +2230,26 @@
$(RT_LIBS) \
$(INTLLIBS)
-value_invert_SOURCES = \
- value-invert.c
+tile_SOURCES = \
+ tile.c
-value_invert_LDADD = \
+tile_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
- $(GLIB_LIBS) \
+ $(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
-value_propagate_SOURCES = \
- value-propagate.c
+tile_glass_SOURCES = \
+ tile-glass.c
-value_propagate_LDADD = \
+tile_glass_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2300,10 +2262,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-van_gogh_lic_SOURCES = \
- van-gogh-lic.c
+tile_paper_SOURCES = \
+ tile-paper.c
-van_gogh_lic_LDADD = \
+tile_paper_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2316,10 +2278,23 @@
$(RT_LIBS) \
$(INTLLIBS)
-video_SOURCES = \
- video.c
+tile_seamless_SOURCES = \
+ tile-seamless.c
-video_LDADD = \
+tile_seamless_LDADD = \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(GLIB_LIBS) \
+ $(RT_LIBS) \
+ $(INTLLIBS)
+
+tile_small_SOURCES = \
+ tile-small.c
+
+tile_small_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2332,10 +2307,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-warp_SOURCES = \
- warp.c
+unit_editor_SOURCES = \
+ unit-editor.c
-warp_LDADD = \
+unit_editor_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2348,10 +2323,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-waves_SOURCES = \
- waves.c
+unsharp_mask_SOURCES = \
+ unsharp-mask.c
-waves_LDADD = \
+unsharp_mask_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2364,10 +2339,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-web_browser_SOURCES = \
- web-browser.c
+value_invert_SOURCES = \
+ value-invert.c
-web_browser_LDADD = \
+value_invert_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
@@ -2377,10 +2352,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-whirl_pinch_SOURCES = \
- whirl-pinch.c
+value_propagate_SOURCES = \
+ value-propagate.c
-whirl_pinch_LDADD = \
+value_propagate_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2393,10 +2368,10 @@
$(RT_LIBS) \
$(INTLLIBS)
-wind_SOURCES = \
- wind.c
+van_gogh_lic_SOURCES = \
+ van-gogh-lic.c
-wind_LDADD = \
+van_gogh_lic_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2409,12 +2384,26 @@
$(RT_LIBS) \
$(INTLLIBS)
-wmf_CFLAGS = $(WMF_CFLAGS)
+video_SOURCES = \
+ video.c
+
+video_LDADD = \
+ $(libgimpui) \
+ $(libgimpwidgets) \
+ $(libgimpmodule) \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(GTK_LIBS) \
+ $(RT_LIBS) \
+ $(INTLLIBS)
-wmf_SOURCES = \
- wmf.c
+warp_SOURCES = \
+ warp.c
-wmf_LDADD = \
+warp_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2424,14 +2413,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBWMF) \
$(RT_LIBS) \
$(INTLLIBS)
-xbm_SOURCES = \
- xbm.c
+waves_SOURCES = \
+ waves.c
-xbm_LDADD = \
+waves_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2444,10 +2432,23 @@
$(RT_LIBS) \
$(INTLLIBS)
-xpm_SOURCES = \
- xpm.c
+web_browser_SOURCES = \
+ web-browser.c
+
+web_browser_LDADD = \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(GLIB_LIBS) \
+ $(RT_LIBS) \
+ $(INTLLIBS)
+
+whirl_pinch_SOURCES = \
+ whirl-pinch.c
-xpm_LDADD = \
+whirl_pinch_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
@@ -2457,14 +2458,13 @@
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
- $(LIBXPM) \
$(RT_LIBS) \
$(INTLLIBS)
-xwd_SOURCES = \
- xwd.c
+wind_SOURCES = \
+ wind.c
-xwd_LDADD = \
+wind_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
Copied: trunk/plug-ins/common/file-aa.c (from r26446, /trunk/plug-ins/common/aa.c)
==============================================================================
--- /trunk/plug-ins/common/aa.c (original)
+++ trunk/plug-ins/common/file-aa.c Mon Aug 11 10:06:13 2008
@@ -39,7 +39,7 @@
#define SAVE_PROC "file-aa-save"
-#define PLUG_IN_BINARY "aa"
+#define PLUG_IN_BINARY "file-aa"
/*
Copied: trunk/plug-ins/common/file-cel.c (from r26446, /trunk/plug-ins/common/cel.c)
==============================================================================
--- /trunk/plug-ins/common/cel.c (original)
+++ trunk/plug-ins/common/file-cel.c Mon Aug 11 10:06:13 2008
@@ -34,7 +34,7 @@
#define LOAD_PROC "file-cel-load"
#define SAVE_PROC "file-cel-save"
-#define PLUG_IN_BINARY "cel"
+#define PLUG_IN_BINARY "file-cel"
static void query (void);
Copied: trunk/plug-ins/common/file-csource.c (from r26446, /trunk/plug-ins/common/csource.c)
==============================================================================
--- /trunk/plug-ins/common/csource.c (original)
+++ trunk/plug-ins/common/file-csource.c Mon Aug 11 10:06:13 2008
@@ -32,7 +32,7 @@
#define SAVE_PROC "file-csource-save"
-#define PLUG_IN_BINARY "csource"
+#define PLUG_IN_BINARY "file-csource"
typedef struct
Copied: trunk/plug-ins/common/file-desktop-link.c (from r26489, /trunk/plug-ins/common/desktop-link.c)
==============================================================================
--- /trunk/plug-ins/common/desktop-link.c (original)
+++ trunk/plug-ins/common/file-desktop-link.c Mon Aug 11 10:06:13 2008
@@ -33,7 +33,7 @@
#define LOAD_PROC "file-desktop-link-load"
-#define PLUG_IN_BINARY "desktop-link"
+#define PLUG_IN_BINARY "file-desktop-link"
static void query (void);
Copied: trunk/plug-ins/common/file-dicom.c (from r26446, /trunk/plug-ins/common/dicom.c)
==============================================================================
--- /trunk/plug-ins/common/dicom.c (original)
+++ trunk/plug-ins/common/file-dicom.c Mon Aug 11 10:06:13 2008
@@ -38,7 +38,7 @@
#define LOAD_PROC "file-dicom-load"
#define SAVE_PROC "file-dicom-save"
-#define PLUG_IN_BINARY "dicom"
+#define PLUG_IN_BINARY "file-dicom"
/* A lot of Dicom images are wrongly encoded. By guessing the endian
Copied: trunk/plug-ins/common/file-gbr.c (from r26446, /trunk/plug-ins/common/gbr.c)
==============================================================================
--- /trunk/plug-ins/common/gbr.c (original)
+++ trunk/plug-ins/common/file-gbr.c Mon Aug 11 10:06:13 2008
@@ -69,7 +69,7 @@
#define LOAD_PROC "file-gbr-load"
#define SAVE_PROC "file-gbr-save"
-#define PLUG_IN_BINARY "gbr"
+#define PLUG_IN_BINARY "file-gbr"
typedef struct
Copied: trunk/plug-ins/common/file-gif-save.c (from r26446, /trunk/plug-ins/common/gif-save.c)
==============================================================================
--- /trunk/plug-ins/common/gif-save.c (original)
+++ trunk/plug-ins/common/file-gif-save.c Mon Aug 11 10:06:13 2008
@@ -40,7 +40,7 @@
#define SAVE_PROC "file-gif-save"
-#define PLUG_IN_BINARY "gif-save"
+#define PLUG_IN_BINARY "file-gif-save"
/* Define only one of these to determine which kind of gif's you would like.
Copied: trunk/plug-ins/common/file-gih.c (from r26446, /trunk/plug-ins/common/gih.c)
==============================================================================
--- /trunk/plug-ins/common/gih.c (original)
+++ trunk/plug-ins/common/file-gih.c Mon Aug 11 10:06:13 2008
@@ -78,7 +78,7 @@
#define LOAD_PROC "file-gih-load"
#define SAVE_PROC "file-gih-save"
-#define PLUG_IN_BINARY "gih"
+#define PLUG_IN_BINARY "file-gih"
#define DUMMY_PATTERN_NAME "x"
#define MAXDESCLEN 256
Copied: trunk/plug-ins/common/file-header.c (from r26446, /trunk/plug-ins/common/header.c)
==============================================================================
--- /trunk/plug-ins/common/header.c (original)
+++ trunk/plug-ins/common/file-header.c Mon Aug 11 10:06:13 2008
@@ -29,7 +29,7 @@
#define SAVE_PROC "file-header-save"
-#define PLUG_IN_BINARY "header"
+#define PLUG_IN_BINARY "file-header"
/* Declare some local functions.
Copied: trunk/plug-ins/common/file-html-table.c (from r26446, /trunk/plug-ins/common/html-table.c)
==============================================================================
--- /trunk/plug-ins/common/html-table.c (original)
+++ trunk/plug-ins/common/file-html-table.c Mon Aug 11 10:06:13 2008
@@ -62,7 +62,7 @@
#define SAVE_PROC "file-gtm-save"
-#define PLUG_IN_BINARY "html-table"
+#define PLUG_IN_BINARY "file-html-table"
/* Typedefs */
Copied: trunk/plug-ins/common/file-mng.c (from r26446, /trunk/plug-ins/common/mng.c)
==============================================================================
--- /trunk/plug-ins/common/mng.c (original)
+++ trunk/plug-ins/common/file-mng.c Mon Aug 11 10:06:13 2008
@@ -94,7 +94,7 @@
#define SAVE_PROC "file-mng-save"
-#define PLUG_IN_BINARY "mng"
+#define PLUG_IN_BINARY "file-mng"
#define SCALE_WIDTH 125
enum
Copied: trunk/plug-ins/common/file-pat.c (from r26446, /trunk/plug-ins/common/pat.c)
==============================================================================
--- /trunk/plug-ins/common/pat.c (original)
+++ trunk/plug-ins/common/file-pat.c Mon Aug 11 10:06:13 2008
@@ -52,7 +52,7 @@
#define LOAD_PROC "file-pat-load"
#define SAVE_PROC "file-pat-save"
-#define PLUG_IN_BINARY "pat"
+#define PLUG_IN_BINARY "file-pat"
/* local function prototypes */
Copied: trunk/plug-ins/common/file-pcx.c (from r26446, /trunk/plug-ins/common/pcx.c)
==============================================================================
--- /trunk/plug-ins/common/pcx.c (original)
+++ trunk/plug-ins/common/file-pcx.c Mon Aug 11 10:06:13 2008
@@ -35,7 +35,7 @@
#define LOAD_PROC "file-pcx-load"
#define SAVE_PROC "file-pcx-save"
-#define PLUG_IN_BINARY "pcx"
+#define PLUG_IN_BINARY "file-pcx"
/* Declare local functions. */
Copied: trunk/plug-ins/common/file-pdf.c (from r26446, /trunk/plug-ins/common/poppler.c)
==============================================================================
--- /trunk/plug-ins/common/poppler.c (original)
+++ trunk/plug-ins/common/file-pdf.c Mon Aug 11 10:06:13 2008
@@ -35,7 +35,7 @@
#define LOAD_PROC "file-pdf-load"
#define LOAD_THUMB_PROC "file-pdf-load-thumb"
-#define PLUG_IN_BINARY "poppler"
+#define PLUG_IN_BINARY "file-pdf"
#define THUMBNAIL_SIZE 128
Copied: trunk/plug-ins/common/file-pix.c (from r26446, /trunk/plug-ins/common/pix.c)
==============================================================================
--- /trunk/plug-ins/common/pix.c (original)
+++ trunk/plug-ins/common/file-pix.c Mon Aug 11 10:06:13 2008
@@ -55,7 +55,7 @@
#define LOAD_PROC "file-pix-load"
#define SAVE_PROC "file-pix-save"
-#define PLUG_IN_BINARY "pix"
+#define PLUG_IN_BINARY "file-pix"
/* #define PIX_DEBUG */
Copied: trunk/plug-ins/common/file-png.c (from r26446, /trunk/plug-ins/common/png.c)
==============================================================================
--- /trunk/plug-ins/common/png.c (original)
+++ trunk/plug-ins/common/file-png.c Mon Aug 11 10:06:13 2008
@@ -63,7 +63,7 @@
#define SAVE_DEFAULTS_PROC "file-png-save-defaults"
#define GET_DEFAULTS_PROC "file-png-get-defaults"
#define SET_DEFAULTS_PROC "file-png-set-defaults"
-#define PLUG_IN_BINARY "png"
+#define PLUG_IN_BINARY "file-png"
#define PLUG_IN_VERSION "1.3.4 - 03 September 2002"
#define SCALE_WIDTH 125
Copied: trunk/plug-ins/common/file-pnm.c (from r26446, /trunk/plug-ins/common/pnm.c)
==============================================================================
--- /trunk/plug-ins/common/pnm.c (original)
+++ trunk/plug-ins/common/file-pnm.c Mon Aug 11 10:06:13 2008
@@ -62,7 +62,7 @@
#define PBM_SAVE_PROC "file-pbm-save"
#define PGM_SAVE_PROC "file-pgm-save"
#define PPM_SAVE_PROC "file-ppm-save"
-#define PLUG_IN_BINARY "pnm"
+#define PLUG_IN_BINARY "file-pnm"
/* Declare local data types
Copied: trunk/plug-ins/common/file-ps.c (from r26446, /trunk/plug-ins/common/postscript.c)
==============================================================================
--- /trunk/plug-ins/common/postscript.c (original)
+++ trunk/plug-ins/common/file-ps.c Mon Aug 11 10:06:13 2008
@@ -114,7 +114,7 @@
#define LOAD_PS_THUMB_PROC "file-ps-load-thumb"
#define SAVE_PS_PROC "file-ps-save"
#define SAVE_EPS_PROC "file-eps-save"
-#define PLUG_IN_BINARY "postscript"
+#define PLUG_IN_BINARY "file-ps"
#define STR_LENGTH 64
Copied: trunk/plug-ins/common/file-psp.c (from r26446, /trunk/plug-ins/common/psp.c)
==============================================================================
--- /trunk/plug-ins/common/psp.c (original)
+++ trunk/plug-ins/common/file-psp.c Mon Aug 11 10:06:13 2008
@@ -28,7 +28,7 @@
#define LOAD_PROC "file-psp-load"
#define SAVE_PROC "file-psp-save"
-#define PLUG_IN_BINARY "psp"
+#define PLUG_IN_BINARY "file-psp"
/* set to the level of debugging output you want, 0 for none */
#define PSP_DEBUG 0
Copied: trunk/plug-ins/common/file-raw.c (from r26446, /trunk/plug-ins/common/raw.c)
==============================================================================
--- /trunk/plug-ins/common/raw.c (original)
+++ trunk/plug-ins/common/file-raw.c Mon Aug 11 10:06:13 2008
@@ -49,7 +49,7 @@
#define LOAD_PROC "file-raw-load"
#define SAVE_PROC "file-raw-save"
-#define PLUG_IN_BINARY "raw"
+#define PLUG_IN_BINARY "file-raw"
#define PREVIEW_SIZE 350
Copied: trunk/plug-ins/common/file-sunras.c (from r26446, /trunk/plug-ins/common/sunras.c)
==============================================================================
--- /trunk/plug-ins/common/sunras.c (original)
+++ trunk/plug-ins/common/file-sunras.c Mon Aug 11 10:06:13 2008
@@ -52,7 +52,7 @@
#define LOAD_PROC "file-sunras-load"
#define SAVE_PROC "file-sunras-save"
-#define PLUG_IN_BINARY "sunras"
+#define PLUG_IN_BINARY "file-sunras"
typedef int WRITE_FUN(void*,size_t,size_t,FILE*);
Copied: trunk/plug-ins/common/file-svg.c (from r26446, /trunk/plug-ins/common/svg.c)
==============================================================================
--- /trunk/plug-ins/common/svg.c (original)
+++ trunk/plug-ins/common/file-svg.c Mon Aug 11 10:06:13 2008
@@ -38,7 +38,7 @@
#define LOAD_PROC "file-svg-load"
#define LOAD_THUMB_PROC "file-svg-load-thumb"
-#define PLUG_IN_BINARY "svg"
+#define PLUG_IN_BINARY "file-svg"
#define SVG_VERSION "2.5.0"
#define SVG_DEFAULT_RESOLUTION 90.0
#define SVG_DEFAULT_SIZE 500
Copied: trunk/plug-ins/common/file-tga.c (from r26446, /trunk/plug-ins/common/tga.c)
==============================================================================
--- /trunk/plug-ins/common/tga.c (original)
+++ trunk/plug-ins/common/file-tga.c Mon Aug 11 10:06:13 2008
@@ -95,7 +95,7 @@
#define LOAD_PROC "file-tga-load"
#define SAVE_PROC "file-tga-save"
-#define PLUG_IN_BINARY "tga"
+#define PLUG_IN_BINARY "file-tga"
typedef enum
{
@@ -433,38 +433,42 @@
gimp_progress_init_printf (_("Opening '%s'"),
gimp_filename_to_utf8 (filename));
- if (!fseek (fp, -26L, SEEK_END)) { /* Is file big enough for a footer? */
- if (fread (footer, sizeof (footer), 1, fp) != 1)
- {
- g_message (_("Cannot read footer from '%s'"),
- gimp_filename_to_utf8 (filename));
- return -1;
- }
- else if (memcmp (footer + 8, magic, sizeof (magic)) == 0)
- {
- /* Check the signature. */
+ /* Is file big enough for a footer? */
+ if (!fseek (fp, -26L, SEEK_END))
+ {
+ if (fread (footer, sizeof (footer), 1, fp) != 1)
+ {
+ g_message (_("Cannot read footer from '%s'"),
+ gimp_filename_to_utf8 (filename));
+ return -1;
+ }
+ else if (memcmp (footer + 8, magic, sizeof (magic)) == 0)
+ {
+ /* Check the signature. */
- offset = footer[0] + (footer[1] * 256L) + (footer[2] * 65536L)
- + (footer[3] * 16777216L);
+ offset = (footer[0] +
+ footer[1] * 256L +
+ footer[2] * 65536L +
+ footer[3] * 16777216L);
- if (offset != 0)
- {
- if (fseek (fp, offset, SEEK_SET) ||
- fread (extension, sizeof (extension), 1, fp) != 1)
- {
- g_message (_("Cannot read extension from '%s'"),
- gimp_filename_to_utf8 (filename));
- return -1;
- }
- /* Eventually actually handle version 2 TGA here */
- }
- }
- }
+ if (offset != 0)
+ {
+ if (fseek (fp, offset, SEEK_SET) ||
+ fread (extension, sizeof (extension), 1, fp) != 1)
+ {
+ g_message (_("Cannot read extension from '%s'"),
+ gimp_filename_to_utf8 (filename));
+ return -1;
+ }
+ /* Eventually actually handle version 2 TGA here */
+ }
+ }
+ }
if (fseek (fp, 0, SEEK_SET) ||
fread (header, sizeof (header), 1, fp) != 1)
{
- g_message ("Cannot read header from '%s'",
+ g_message (_("Cannot read header from '%s'"),
gimp_filename_to_utf8 (filename));
return -1;
}
@@ -508,7 +512,7 @@
info.colorMapLength = header[5] + header[6] * 256;
info.colorMapSize = header[7];
- info.xOrigin = header[8] + header[9] * 256;
+ info.xOrigin = header[8] + header[9] * 256;
info.yOrigin = header[10] + header[11] * 256;
info.width = header[12] + header[13] * 256;
info.height = header[14] + header[15] * 256;
@@ -523,6 +527,16 @@
if (info.alphaBits == info.bpp)
info.alphaBits = 0;
+ /* hack to handle yet another flavor of incorrect headers, see bug #540969 */
+ if (info.alphaBits == 0)
+ {
+ if (info.imageType == TGA_TYPE_COLOR && info.bpp == 32)
+ info.alphaBits = 8;
+
+ if (info.imageType == TGA_TYPE_GRAY && info.bpp == 16)
+ info.alphaBits = 8;
+ }
+
switch (info.imageType)
{
case TGA_TYPE_MAPPED:
@@ -535,8 +549,8 @@
}
break;
case TGA_TYPE_COLOR:
- if (info.bpp != 15 && info.bpp != 16 && info.bpp != 24
- && info.bpp != 32)
+ if (info.bpp != 15 && info.bpp != 16 &&
+ info.bpp != 24 && info.bpp != 32)
{
g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
gimp_filename_to_utf8 (filename),
@@ -545,8 +559,8 @@
}
break;
case TGA_TYPE_GRAY:
- if (info.bpp != 8
- && (info.alphaBits != 8 || (info.bpp != 16 && info.bpp != 15)))
+ if (info.bpp != 8 &&
+ (info.alphaBits != 8 || (info.bpp != 16 && info.bpp != 15)))
{
g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
gimp_filename_to_utf8 (filename),
@@ -593,7 +607,9 @@
}
image_ID = ReadImage (fp, &info, filename);
+
fclose (fp);
+
return image_ID;
}
Copied: trunk/plug-ins/common/file-tiff-load.c (from r26446, /trunk/plug-ins/common/tiff-load.c)
==============================================================================
--- /trunk/plug-ins/common/tiff-load.c (original)
+++ trunk/plug-ins/common/file-tiff-load.c Mon Aug 11 10:06:13 2008
@@ -72,7 +72,7 @@
#define LOAD_PROC "file-tiff-load"
-#define PLUG_IN_BINARY "tiff-load"
+#define PLUG_IN_BINARY "file-tiff-load"
typedef struct
Copied: trunk/plug-ins/common/file-tiff-save.c (from r26446, /trunk/plug-ins/common/tiff-save.c)
==============================================================================
--- /trunk/plug-ins/common/tiff-save.c (original)
+++ trunk/plug-ins/common/file-tiff-save.c Mon Aug 11 10:06:13 2008
@@ -73,7 +73,7 @@
#define SAVE_PROC "file-tiff-save"
#define SAVE2_PROC "file-tiff-save2"
-#define PLUG_IN_BINARY "tiff-save"
+#define PLUG_IN_BINARY "file-tiff-save"
typedef struct
Copied: trunk/plug-ins/common/file-wmf.c (from r26446, /trunk/plug-ins/common/wmf.c)
==============================================================================
--- /trunk/plug-ins/common/wmf.c (original)
+++ trunk/plug-ins/common/file-wmf.c Mon Aug 11 10:06:13 2008
@@ -35,7 +35,7 @@
#define LOAD_PROC "file-wmf-load"
#define LOAD_THUMB_PROC "file-wmf-load-thumb"
-#define PLUG_IN_BINARY "wmf"
+#define PLUG_IN_BINARY "file-wmf"
#define WMF_DEFAULT_RESOLUTION 90.0
#define WMF_DEFAULT_SIZE 500
Copied: trunk/plug-ins/common/file-xbm.c (from r26446, /trunk/plug-ins/common/xbm.c)
==============================================================================
--- /trunk/plug-ins/common/xbm.c (original)
+++ trunk/plug-ins/common/file-xbm.c Mon Aug 11 10:06:13 2008
@@ -51,7 +51,7 @@
#define LOAD_PROC "file-xbm-load"
#define SAVE_PROC "file-xbm-save"
-#define PLUG_IN_BINARY "xbm"
+#define PLUG_IN_BINARY "file-xbm"
/* Wear your GIMP with pride! */
Copied: trunk/plug-ins/common/file-xpm.c (from r26446, /trunk/plug-ins/common/xpm.c)
==============================================================================
--- /trunk/plug-ins/common/xpm.c (original)
+++ trunk/plug-ins/common/file-xpm.c Mon Aug 11 10:06:13 2008
@@ -71,7 +71,7 @@
#define LOAD_PROC "file-xpm-load"
#define SAVE_PROC "file-xpm-save"
-#define PLUG_IN_BINARY "xpm"
+#define PLUG_IN_BINARY "file-xpm"
#define SCALE_WIDTH 125
/* Structs for the save dialog */
Copied: trunk/plug-ins/common/file-xwd.c (from r26446, /trunk/plug-ins/common/xwd.c)
==============================================================================
--- /trunk/plug-ins/common/xwd.c (original)
+++ trunk/plug-ins/common/file-xwd.c Mon Aug 11 10:06:13 2008
@@ -64,7 +64,7 @@
#define LOAD_PROC "file-xwd-load"
#define SAVE_PROC "file-xwd-save"
-#define PLUG_IN_BINARY "xwd"
+#define PLUG_IN_BINARY "file-xwd"
typedef gulong L_CARD32;
Modified: trunk/plug-ins/common/mkgen.pl
==============================================================================
--- trunk/plug-ins/common/mkgen.pl (original)
+++ trunk/plug-ins/common/mkgen.pl Mon Aug 11 10:06:13 2008
@@ -107,7 +107,9 @@
foreach (sort keys %plugins) {
my $makename = $_;
+ my $MAKENAME;
$makename =~ s/-/_/g;
+ $MAKENAME = "\U$makename";
my $libgimp = "";
@@ -144,7 +146,7 @@
if (exists $plugins{$_}->{cflags}) {
my $cflags = $plugins{$_}->{cflags};
- my $optflags = $cflags =~ /FLAGS/ ? $cflags : "\U$_\E_CFLAGS";
+ my $optflags = $cflags =~ /FLAGS/ ? $cflags : "$MAKENAME\E_CFLAGS";
print MK <<EOT;
Modified: trunk/plug-ins/common/plugin-defs.pl
==============================================================================
--- trunk/plug-ins/common/plugin-defs.pl (original)
+++ trunk/plug-ins/common/plugin-defs.pl Mon Aug 11 10:06:13 2008
@@ -1,5 +1,4 @@
%plugins = (
- 'aa' => { ui => 1, optional => 1 },
'alien-map' => { ui => 1 },
'align-layers' => { ui => 1 },
'animation-optimize' => {},
@@ -14,7 +13,6 @@
'border-average' => { ui => 1 },
'bump-map' => { ui => 1 },
'cartoon' => { ui => 1 },
- 'cel' => { ui => 1 },
'channel-mixer' => { ui => 1 },
'checkerboard' => { ui => 1 },
'cml-explorer' => { ui => 1 },
@@ -33,41 +31,62 @@
'convolution-matrix' => { ui => 1 },
'crop-auto' => {},
'crop-zealous' => {},
- 'csource' => { ui => 1 },
'cubism' => { ui => 1 },
'curve-bend' => { ui => 1 },
'decompose' => { ui => 1 },
'deinterlace' => { ui => 1 },
'depth-merge' => { ui => 1 },
- 'desktop-link' => {},
'despeckle' => { ui => 1 },
'destripe' => { ui => 1 },
- 'dicom' => { ui => 1 },
'diffraction' => { ui => 1 },
'displace' => { ui => 1 },
'edge' => { ui => 1 },
'edge-dog' => { ui => 1 },
- 'edge-neon' => { ui => 1 },
'edge-laplace' => {},
+ 'edge-neon' => { ui => 1 },
'edge-sobel' => { ui => 1 },
'emboss' => { ui => 1 },
'engrave' => { ui => 1 },
+ 'file-aa' => { ui => 1, optional => 1, libs => 'LIBAA' },
+ 'file-cel' => { ui => 1 },
+ 'file-csource' => { ui => 1 },
+ 'file-desktop-link' => {},
+ 'file-dicom' => { ui => 1 },
+ 'file-gbr' => { ui => 1 },
+ 'file-gif-load' => {},
+ 'file-gif-save' => { ui => 1 },
+ 'file-gih' => { ui => 1 },
+ 'file-glob' => {},
+ 'file-header' => { ui => 1 },
+ 'file-html-table' => { ui => 1 },
+ 'file-mng' => { ui => 1, optional => 1, libs => 'LIBMNG' },
+ 'file-pat' => { ui => 1 },
+ 'file-pcx' => { ui => 1 },
+ 'file-pix' => { ui => 1 },
+ 'file-png' => { ui => 1, optional => 1, libs => 'LIBPNG', cflags => 'PNG_CFLAGS' },
+ 'file-pnm' => { ui => 1 },
+ 'file-pdf' => { ui => 1, optional => 1, libs => 'LIBPOPPLER', cflags => 'POPPLER_CFLAGS' },
+ 'file-ps' => { ui => 1 },
+ 'file-psp' => { ui => 1, optional => 1, libopt => 'z' },
+ 'file-raw' => { ui => 1 },
+ 'file-sunras' => { ui => 1 },
+ 'file-svg' => { ui => 1, optional => 1, libs => 'LIBSVG', cflags => 'SVG_CFLAGS' },
+ 'file-tga' => { ui => 1 },
+ 'file-tiff-load' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
+ 'file-tiff-save' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
+ 'file-wmf' => { ui => 1, optional => 1, libs => 'LIBWMF', cflags => 'WMF_CFLAGS' },
+ 'file-xbm' => { ui => 1 },
+ 'file-xpm' => { ui => 1, optional => 1, libs => 'LIBXPM' },
+ 'file-xwd' => { ui => 1 },
'film' => { ui => 1 },
'filter-pack' => { ui => 1 },
'fractal-trace' => { ui => 1 },
- 'gbr' => { ui => 1 },
'gee' => { ui => 1 },
'gee-zoom' => { ui => 1 },
- 'gif-load' => {},
- 'gif-save' => { ui => 1 },
- 'gih' => { ui => 1 },
- 'glob' => {},
'gradient-map' => {},
'grid' => { ui => 1 },
'guillotine' => {},
- 'header' => { ui => 1 },
'hot' => { ui => 1 },
- 'html-table' => { ui => 1 },
'illusion' => { ui => 1 },
'iwarp' => { ui => 1 },
'jigsaw' => { ui => 1 },
@@ -77,7 +96,6 @@
'lens-flare' => { ui => 1 },
'mail' => { ui => 1, optional => 1 },
'max-rgb' => { ui => 1 },
- 'mng' => { ui => 1, optional => 1 },
'mosaic' => { ui => 1 },
'newsprint' => { ui => 1 },
'nl-filter' => { ui => 1 },
@@ -88,22 +106,13 @@
'noise-spread' => { ui => 1 },
'nova' => { ui => 1 },
'oilify' => { ui => 1 },
- 'pat' => { ui => 1 },
- 'pcx' => { ui => 1 },
'photocopy' => { ui => 1 },
- 'pix' => { ui => 1 },
'pixelize' => { ui => 1 },
'plasma' => { ui => 1 },
'plugin-browser' => { ui => 1 },
- 'png' => { ui => 1, optional => 1, cflags => 1 },
- 'pnm' => { ui => 1 },
'polar-coords' => { ui => 1 },
- 'poppler' => { ui => 1, optional => 1, cflags => 1 },
- 'postscript' => { ui => 1 },
'procedure-browser' => { ui => 1 },
- 'psp' => { ui => 1, optional => 1, libopt => 'z' },
'qbist' => { ui => 1 },
- 'raw' => { ui => 1 },
'red-eye-removal' => { ui => 1 },
'ripple' => { ui => 1 },
'rotate' => {},
@@ -117,12 +126,7 @@
'softglow' => { ui => 1 },
'sparkle' => { ui => 1 },
'sphere-designer' => { ui => 1 },
- 'sunras' => { ui => 1 },
- 'svg' => { ui => 1, optional => 1, cflags => 1 },
- 'tga' => { ui => 1 },
'threshold-alpha' => { ui => 1 },
- 'tiff-load' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
- 'tiff-save' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
'tile' => { ui => 1 },
'tile-glass' => { ui => 1 },
'tile-paper' => { ui => 1 },
@@ -138,9 +142,5 @@
'waves' => { ui => 1 },
'web-browser' => {},
'whirl-pinch' => { ui => 1 },
- 'wind' => { ui => 1 },
- 'wmf' => { ui => 1, optional => 1, cflags => 1 },
- 'xbm' => { ui => 1 },
- 'xpm' => { ui => 1, optional => 1 },
- 'xwd' => { ui => 1 }
+ 'wind' => { ui => 1 }
);
Modified: trunk/plug-ins/file-bmp/Makefile.am
==============================================================================
--- /trunk/plug-ins/bmp/Makefile.am (original)
+++ trunk/plug-ins/file-bmp/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,9 +16,9 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = bmp
+libexec_PROGRAMS = file-bmp
-bmp_SOURCES = \
+file_bmp_SOURCES = \
bmp.c \
bmp.h \
bmp-read.c \
Copied: trunk/plug-ins/file-bmp/bmp.c (from r26446, /trunk/plug-ins/bmp/bmp.c)
==============================================================================
--- /trunk/plug-ins/bmp/bmp.c (original)
+++ trunk/plug-ins/file-bmp/bmp.c Mon Aug 11 10:06:13 2008
@@ -221,7 +221,7 @@
case GIMP_RUN_WITH_LAST_VALS:
if (run_mode == GIMP_RUN_WITH_LAST_VALS) lastvals = TRUE;
- gimp_ui_init ("bmp", FALSE);
+ gimp_ui_init ("file-bmp", FALSE);
export = gimp_export_image (&image_ID, &drawable_ID, "BMP",
(GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_ALPHA |
@@ -258,4 +258,3 @@
values[0].data.d_status = status;
}
-
Modified: trunk/plug-ins/file-faxg3/Makefile.am
==============================================================================
--- /trunk/plug-ins/faxg3/Makefile.am (original)
+++ trunk/plug-ins/file-faxg3/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,9 +16,9 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = faxg3
+libexec_PROGRAMS = file-faxg3
-faxg3_SOURCES = \
+file_faxg3_SOURCES = \
faxg3.c \
g3.c \
g3.h
Modified: trunk/plug-ins/file-fits/Makefile.am
==============================================================================
--- /trunk/plug-ins/fits/Makefile.am (original)
+++ trunk/plug-ins/file-fits/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,9 +16,9 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = fits
+libexec_PROGRAMS = file-fits
-fits_SOURCES = \
+file_fits_SOURCES = \
fits.c \
fits-io.c \
fits-io.h
Copied: trunk/plug-ins/file-fits/fits.c (from r26446, /trunk/plug-ins/fits/fits.c)
==============================================================================
--- /trunk/plug-ins/fits/fits.c (original)
+++ trunk/plug-ins/file-fits/fits.c Mon Aug 11 10:06:13 2008
@@ -52,7 +52,7 @@
#define LOAD_PROC "file-fits-load"
#define SAVE_PROC "file-fits-save"
-#define PLUG_IN_BINARY "fits"
+#define PLUG_IN_BINARY "file-fits"
/* Load info */
Modified: trunk/plug-ins/file-fli/Makefile.am
==============================================================================
--- /trunk/plug-ins/fli/Makefile.am (original)
+++ trunk/plug-ins/file-fli/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,9 +16,9 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = fli
+libexec_PROGRAMS = file-fli
-fli_SOURCES = \
+file_fli_SOURCES = \
fli.h \
fli.c \
fli-gimp.c
Modified: trunk/plug-ins/file-fli/fli-gimp.c
==============================================================================
--- /trunk/plug-ins/fli/fli-gimp.c (original)
+++ trunk/plug-ins/file-fli/fli-gimp.c Mon Aug 11 10:06:13 2008
@@ -68,7 +68,7 @@
#define LOAD_PROC "file-fli-load"
#define SAVE_PROC "file-fli-save"
#define INFO_PROC "file-fli-info"
-#define PLUG_IN_BINARY "fli"
+#define PLUG_IN_BINARY "file-fli"
static void query (void);
Modified: trunk/plug-ins/file-ico/Makefile.am
==============================================================================
--- /trunk/plug-ins/ico/Makefile.am (original)
+++ trunk/plug-ins/file-ico/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,11 +16,11 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = ico
+libexec_PROGRAMS = file-ico
-ico_CFLAGS = $(PNG_CFLAGS)
+file_ico_CFLAGS = $(PNG_CFLAGS)
-ico_SOURCES = \
+file_ico_SOURCES = \
ico.c \
ico.h \
ico-dialog.c \
Modified: trunk/plug-ins/file-ico/ico-save.c
==============================================================================
--- /trunk/plug-ins/ico/ico-save.c (original)
+++ trunk/plug-ins/file-ico/ico-save.c Mon Aug 11 10:06:13 2008
@@ -233,7 +233,7 @@
gint i;
gint response;
- gimp_ui_init ("winicon", TRUE);
+ gimp_ui_init ("file-ico", TRUE);
dialog = ico_dialog_new (info);
for (i = 0; i < info->num_icons; i++)
Modified: trunk/plug-ins/file-jpeg/Makefile.am
==============================================================================
--- /trunk/plug-ins/jpeg/Makefile.am (original)
+++ trunk/plug-ins/file-jpeg/Makefile.am Mon Aug 11 10:06:13 2008
@@ -22,9 +22,9 @@
$(EXIF_CFLAGS) \
-I$(includedir)
-libexec_PROGRAMS = jpeg
+libexec_PROGRAMS = file-jpeg
-jpeg_SOURCES = \
+file_jpeg_SOURCES = \
jpeg.c \
jpeg.h \
jpeg-exif.c \
@@ -41,7 +41,7 @@
gimpexif.c \
gimpexif.h
-jpeg_LDADD = \
+file_jpeg_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpconfig) \
Modified: trunk/plug-ins/file-jpeg/jpeg.h
==============================================================================
--- /trunk/plug-ins/jpeg/jpeg.h (original)
+++ trunk/plug-ins/file-jpeg/jpeg.h Mon Aug 11 10:06:13 2008
@@ -19,7 +19,7 @@
#define LOAD_PROC "file-jpeg-load"
#define LOAD_THUMB_PROC "file-jpeg-load-thumb"
#define SAVE_PROC "file-jpeg-save"
-#define PLUG_IN_BINARY "jpeg"
+#define PLUG_IN_BINARY "flie-jpeg"
/* headers used in some APPn markers */
#define JPEG_APP_HEADER_EXIF "Exif\0\0"
Modified: trunk/plug-ins/file-psd/Makefile.am
==============================================================================
--- /trunk/plug-ins/psd/Makefile.am (original)
+++ trunk/plug-ins/file-psd/Makefile.am Mon Aug 11 10:06:13 2008
@@ -17,10 +17,10 @@
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = \
- psd-load \
- psd-save
+ file-psd-load \
+ file-psd-save
-psd_load_SOURCES = \
+file_psd_load_SOURCES = \
psd.c \
psd.h \
psd-util.c \
@@ -34,7 +34,7 @@
psd-layer-res-load.c \
psd-layer-res-load.h
-psd_save_SOURCES = \
+file_psd_save_SOURCES = \
psd-save.c
EXTRA_DIST = \
Modified: trunk/plug-ins/file-psd/psd-save.c
==============================================================================
--- /trunk/plug-ins/psd/psd-save.c (original)
+++ trunk/plug-ins/file-psd/psd-save.c Mon Aug 11 10:06:13 2008
@@ -80,7 +80,7 @@
/* *** DEFINES *** */
#define SAVE_PROC "file-psd-save"
-#define PLUG_IN_BINARY "psd-save"
+#define PLUG_IN_BINARY "file-psd-save"
/* set to TRUE if you want debugging, FALSE otherwise */
#define DEBUG FALSE
Modified: trunk/plug-ins/file-psd/psd.h
==============================================================================
--- /trunk/plug-ins/psd/psd.h (original)
+++ trunk/plug-ins/file-psd/psd.h Mon Aug 11 10:06:13 2008
@@ -41,7 +41,7 @@
#define LOAD_PROC "file-psd-load"
#define LOAD_THUMB_PROC "file-psd-load-thumb"
#define SAVE_PROC "file-psd-save"
-#define PLUG_IN_BINARY "psd"
+#define PLUG_IN_BINARY "file-psd"
#define DECODE_XMP_PROC "plug-in-metadata-decode-xmp"
Modified: trunk/plug-ins/file-sgi/Makefile.am
==============================================================================
--- /trunk/plug-ins/sgi/Makefile.am (original)
+++ trunk/plug-ins/file-sgi/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,9 +16,9 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = sgi
+libexec_PROGRAMS = file-sgi
-sgi_SOURCES = \
+file_sgi_SOURCES = \
sgi.c \
sgi-lib.c \
sgi-lib.h
Modified: trunk/plug-ins/file-sgi/sgi.c
==============================================================================
--- /trunk/plug-ins/sgi/sgi.c (original)
+++ trunk/plug-ins/file-sgi/sgi.c Mon Aug 11 10:06:13 2008
@@ -47,7 +47,7 @@
#define LOAD_PROC "file-sgi-load"
#define SAVE_PROC "file-sgi-save"
-#define PLUG_IN_BINARY "sgi"
+#define PLUG_IN_BINARY "file-sgi"
#define PLUG_IN_VERSION "1.1.1 - 17 May 1998"
Modified: trunk/plug-ins/file-uri/Makefile.am
==============================================================================
--- /trunk/plug-ins/uri/Makefile.am (original)
+++ trunk/plug-ins/file-uri/Makefile.am Mon Aug 11 10:06:13 2008
@@ -16,7 +16,7 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = uri
+libexec_PROGRAMS = file-uri
if HAVE_GVFS
backend_sources = gimpmountoperation.c gimpmountoperation.h uri-backend-gvfs.c
@@ -40,7 +40,7 @@
endif
endif
-uri_SOURCES = \
+file_uri_SOURCES = \
uri.c \
uri-backend.h \
$(backend_sources)
Modified: trunk/plug-ins/file-uri/uri.c
==============================================================================
--- /trunk/plug-ins/uri/uri.c (original)
+++ trunk/plug-ins/file-uri/uri.c Mon Aug 11 10:06:13 2008
@@ -40,7 +40,7 @@
#define LOAD_PROC "file-uri-load"
#define SAVE_PROC "file-uri-save"
-#define PLUG_IN_BINARY "uri"
+#define PLUG_IN_BINARY "file-uri"
static void query (void);
Modified: trunk/plug-ins/file-xjt/Makefile.am
==============================================================================
--- /trunk/plug-ins/xjt/Makefile.am (original)
+++ trunk/plug-ins/file-xjt/Makefile.am Mon Aug 11 10:06:13 2008
@@ -10,13 +10,13 @@
libexecdir = $(gimpplugindir)/plug-ins
-libexec_PROGRAMS = xjt
+libexec_PROGRAMS = file-xjt
EXTRA_DIST = \
README \
README_xjt_fileformat.txt
-xjt_SOURCES = \
+file_xjt_SOURCES = \
xjt.c \
xjpeg.c \
xjpeg.h
Modified: trunk/plug-ins/file-xjt/xjt.c
==============================================================================
--- /trunk/plug-ins/xjt/xjt.c (original)
+++ trunk/plug-ins/file-xjt/xjt.c Mon Aug 11 10:06:13 2008
@@ -86,6 +86,7 @@
#define LOAD_PROC "file-xjt-load"
#define SAVE_PROC "file-xjt-save"
+#define PLUG_IN_BINARY "flie-xjt"
#ifdef _MSC_VER
typedef int pid_t;
@@ -849,9 +850,9 @@
GtkObject *scale_data;
gboolean run;
- gimp_ui_init ("xjt", FALSE);
+ gimp_ui_init (PLUG_IN_BINARY, FALSE);
- dlg = gimp_dialog_new (_("Save as XJT"), "xjt",
+ dlg = gimp_dialog_new (_("Save as XJT"), PLUG_IN_BINARY,
NULL, 0,
gimp_standard_help_func, "file-xjt-save",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
