diff --git a/ChangeLog b/ChangeLog index 4dbd06c532..8f284bdc59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,106 @@ +2001-01-23 Michael Natterer + + * Makefile.am + * configure.in + * gimptool.in: added stuff for the new library below. + + * libgimpcolor/.cvsignore + * libgimpcolor/Makefile.am + * libgimpcolor/gimpcolor.h + * libgimpcolor/gimpcolorspace.c + * libgimpcolor/gimpcolorspace.h + * libgimpcolor/gimpcolortypes.h + * libgimpcolor/gimphsv.c + * libgimpcolor/gimphsv.h + * libgimpcolor/gimprgb.c + * libgimpcolor/gimprgb.h: new shared library which both the app + and plug-ins link against. The library depends only on glib. + + * libgimpcolor/gimpcolor.def + * libgimpcolor/makefile.mingw.in + * libgimpcolor/makefile.msc: added Win32 build files which + definitely don't work. + + * libgimp/Makefile.am + * libgimp/gimpcolor.[ch] + * libgimp/gimpcolorspace.[ch]: removed. + + * libgimp/gimp.h + * libgimp/gimpadaptivesupersample.c + * libgimp/gimpbilinear.c + * libgimp/gimppalette.c + * libgimp/gimptypes.h: include the stuff from libgimpcolor. + + Plug-Ins don't need to include + explicitely. LibGimp depends on libgimpcolor and thus also includes + it's headers. + + * libgimp/gimp.def + * libgimp/makefile.mingw.in: fiddled around with Win32 stuff... + + * app/Makefile.am: link against libgimpcolor.la + + * app/apptypes.h: include "libgimpcolor/gimpcolortypes.h" + + * app/asupsample.c + * app/channels_dialog.c + * app/colormap_dialog.c + * app/commands.c + * app/convert.c + * app/devices.c + * app/disp_callbacks.c + * app/drawable.c + * app/gimpcontext.c + * app/gimpdnd.c + * app/gimpimage.c + * app/gimppalette.c + * app/gimprc.c + * app/gradient.c + * app/libgimp_glue.c + * app/palette.c + * app/palette_import.c + * app/qmask.c + * app/xcf.c + * app/tools/paint_core.c + * app/tools/paintbrush.c + * app/tools/pencil.c: include "libgimpcolor/gimpcolor.h" before all + gimp includes because it's a standalone library. + + * plug-ins/FractalExplorer/Makefile.am + * plug-ins/Lighting/Makefile.am + * plug-ins/MapObject/Makefile.am + * plug-ins/bmp/Makefile.am + * plug-ins/common/Makefile.am + * plug-ins/common/mkgen.pl + * plug-ins/dbbrowser/Makefile.am + * plug-ins/faxg3/Makefile.am + * plug-ins/fits/Makefile.am + * plug-ins/flame/Makefile.am + * plug-ins/fp/Makefile.am + * plug-ins/gap/Makefile.am + * plug-ins/gdyntext/Makefile.am + * plug-ins/gfig/Makefile.am + * plug-ins/gflare/Makefile.am + * plug-ins/gfli/Makefile.am + * plug-ins/gimpressionist/Makefile.am + * plug-ins/helpbrowser/Makefile.am + * plug-ins/ifscompose/Makefile.am + * plug-ins/imagemap/Makefile.am + * plug-ins/maze/Makefile.am + * plug-ins/mosaic/Makefile.am + * plug-ins/pagecurl/Makefile.am + * plug-ins/print/Makefile.am + * plug-ins/rcm/Makefile.am + * plug-ins/script-fu/Makefile.am + * plug-ins/sel2path/Makefile.am + * plug-ins/sgi/Makefile.am + * plug-ins/webbrowser/Makefile.am + * plug-ins/xjt/Makefile.am: add libgimpcolor.la to LDADD. + + * INSTALL: don't recommend to --disable-shared for development. + + * TODO.xml: increased some percentages, added plug-in help stuff. + 2001-01-23 Michael Natterer * app/Makefile.am diff --git a/INSTALL b/INSTALL index 51dd9776ad..296a6a24db 100644 --- a/INSTALL +++ b/INSTALL @@ -42,10 +42,8 @@ recognizes. These are: 1. --enable-shared and --disable-shared. This option affects whether shared libraries will be built or not. Shared libraries provide - for much smaller executables, but they are difficult to debug - with. If you are interested in doing development, it is probably - wise to specify `--disable-shared'. The default is to enable - shared libraries. + for much smaller executables. The default is to enable shared + libraries. Disabling shared libraries is almost never a good idea. 2. --enable-debug and --disable-debug. This option causes the build process to compile with debugging enabled. If debugging is diff --git a/Makefile.am b/Makefile.am index 0ca98551f2..989ace6285 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = \ tools \ intl \ + libgimpcolor \ libgimp \ app \ $(GIMP_PLUGINS) \ diff --git a/TODO.xml b/TODO.xml index 083831af5b..4805b663f2 100644 --- a/TODO.xml +++ b/TODO.xml @@ -173,7 +173,7 @@
LibGimp - + Restructure LibGimp

@@ -187,7 +187,7 @@ - + Utility library

@@ -213,7 +213,7 @@ - + Move GCK functionality into LibGimp

@@ -399,13 +399,37 @@ -

- + + +
+ Help System + + + Rethink Plug-In and Script Help + +

+ Currently a Plug-In's help file determined by the application + from it's executable name. This is broken because is does not + cover multiple PDB procedures implemented in one Plug-In. +

+

+ A possible solution would be to pass the relative path to the + help file to gimp_install_procedure(). A similar fix should be + applied to Script-Fu and Perl. +

+ + + GIMP Developer List <gimp-developer@xcf.berkeley.edu> + + + +
+
Internationalization - Context-sensitive translations + Context-Sensitive Translations

The same english string used in different contexts may need to diff --git a/app/Makefile.am b/app/Makefile.am index f5a2ddbee9..5f5c9c4fee 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -309,12 +309,13 @@ INCLUDES = \ -I$(includedir) gimp_LDADD = \ - pdb/libapppdb.la \ - tools/libapptools.la \ - $(top_builddir)/libgimp/libgimpi.a \ - $(GTK_LIBS) \ - $(GIMP_THREAD_LIBS) \ - $(GIMP_MP_LIBS) \ + pdb/libapppdb.la \ + tools/libapptools.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(top_builddir)/libgimp/libgimpi.a \ + $(GTK_LIBS) \ + $(GIMP_THREAD_LIBS) \ + $(GIMP_MP_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c index d4c44a19c0..c2bb5fecdc 100644 --- a/app/actions/help-commands.c +++ b/app/actions/help-commands.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c index 9f2959db08..84ea51d51e 100644 --- a/app/actions/qmask-commands.c +++ b/app/actions/qmask-commands.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index 9f2959db08..84ea51d51e 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/apptypes.h b/app/apptypes.h index 242141914d..3e9de33f76 100644 --- a/app/apptypes.h +++ b/app/apptypes.h @@ -20,15 +20,17 @@ #define __APPTYPES_H__ -#include "undo_types.h" +#include "libgimpcolor/gimpcolortypes.h" +#include "libgimp/gimpuitypes.h" -/* these will go into a general purpose library */ -#include "libgimp/gimpcolor.h" + +/* stuff that will go to general-purpose libraries */ #include "libgimp/gimpmatrix.h" #include "libgimp/gimpvector.h" #include "libgimp/gimpunit.h" -#include "libgimp/gimpuitypes.h" + +#include "undo_types.h" #include "appenums.h" diff --git a/app/asupsample.c b/app/asupsample.c index 50e398b445..9c36998d57 100644 --- a/app/asupsample.c +++ b/app/asupsample.c @@ -33,6 +33,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/channels_dialog.c b/app/channels_dialog.c index b7e55dda2f..a7404ed2f5 100644 --- a/app/channels_dialog.c +++ b/app/channels_dialog.c @@ -21,6 +21,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/colormap_dialog.c b/app/colormap_dialog.c index eff0e69f72..b523e234f3 100644 --- a/app/colormap_dialog.c +++ b/app/colormap_dialog.c @@ -25,6 +25,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "color_notebook.h" diff --git a/app/commands.c b/app/commands.c index d4c44a19c0..c2bb5fecdc 100644 --- a/app/commands.c +++ b/app/commands.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/convert.c b/app/convert.c index 4698aef2a1..3e1837f2e3 100644 --- a/app/convert.c +++ b/app/convert.c @@ -91,6 +91,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index 9f3b8b60f5..13147cc15d 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c index 4698aef2a1..3e1837f2e3 100644 --- a/app/core/gimpimage-convert.c +++ b/app/core/gimpimage-convert.c @@ -91,6 +91,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpimage-guides.c +++ b/app/core/gimpimage-guides.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/core/gimpimage-projection.c b/app/core/gimpimage-projection.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpimage-projection.c +++ b/app/core/gimpimage-projection.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/core/gimpimage-qmask.c b/app/core/gimpimage-qmask.c index 9f2959db08..84ea51d51e 100644 --- a/app/core/gimpimage-qmask.c +++ b/app/core/gimpimage-qmask.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c index 9f2959db08..84ea51d51e 100644 --- a/app/core/gimpimage-quick-mask.c +++ b/app/core/gimpimage-quick-mask.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpimage-resize.c +++ b/app/core/gimpimage-resize.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpimage-scale.c +++ b/app/core/gimpimage-scale.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index ce4886c51a..6eace20654 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -27,6 +27,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "gimppalette.h" diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c index ce4886c51a..6eace20654 100644 --- a/app/core/gimppalette-save.c +++ b/app/core/gimppalette-save.c @@ -27,6 +27,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "gimppalette.h" diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index ce4886c51a..6eace20654 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -27,6 +27,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "gimppalette.h" diff --git a/app/core/gimpprojection-construct.c b/app/core/gimpprojection-construct.c index 986e443dd0..2931413b4d 100644 --- a/app/core/gimpprojection-construct.c +++ b/app/core/gimpprojection-construct.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/devices.c b/app/devices.c index 3f7f2e91f6..58cc442536 100644 --- a/app/devices.c +++ b/app/devices.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index d29471cc02..730de5a771 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c index f7edc8ec1d..cdeed96461 100644 --- a/app/disp_callbacks.c +++ b/app/disp_callbacks.c @@ -23,6 +23,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/display/gimpdisplay-callbacks.c b/app/display/gimpdisplay-callbacks.c index f7edc8ec1d..cdeed96461 100644 --- a/app/display/gimpdisplay-callbacks.c +++ b/app/display/gimpdisplay-callbacks.c @@ -23,6 +23,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index f7edc8ec1d..cdeed96461 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -23,6 +23,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/display/gimpdisplayshell-qmask.c b/app/display/gimpdisplayshell-qmask.c index 9f2959db08..84ea51d51e 100644 --- a/app/display/gimpdisplayshell-qmask.c +++ b/app/display/gimpdisplayshell-qmask.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/drawable.c b/app/drawable.c index a0874f7e7a..c0fe660895 100644 --- a/app/drawable.c +++ b/app/drawable.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "drawable.h" diff --git a/app/gimpcontext.c b/app/gimpcontext.c index 9f3b8b60f5..13147cc15d 100644 --- a/app/gimpcontext.c +++ b/app/gimpcontext.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gimpdnd.c b/app/gimpdnd.c index 0a409d59e6..fa6e23c76f 100644 --- a/app/gimpdnd.c +++ b/app/gimpdnd.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" @@ -44,10 +46,11 @@ #include "libgimp/gimplimits.h" #include "libgimp/gimpcolorarea.h" -#define DRAG_PREVIEW_SIZE 32 +#define DRAG_PREVIEW_SIZE 32 #define DRAG_ICON_OFFSET -8 + typedef enum { GIMP_DND_DATA_COLOR = 1, diff --git a/app/gimpimage-convert.c b/app/gimpimage-convert.c index 4698aef2a1..3e1837f2e3 100644 --- a/app/gimpimage-convert.c +++ b/app/gimpimage-convert.c @@ -91,6 +91,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gimpimage.c b/app/gimpimage.c index 986e443dd0..2931413b4d 100644 --- a/app/gimpimage.c +++ b/app/gimpimage.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/gimppalette.c b/app/gimppalette.c index ce4886c51a..6eace20654 100644 --- a/app/gimppalette.c +++ b/app/gimppalette.c @@ -27,6 +27,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "gimppalette.h" diff --git a/app/gimprc.c b/app/gimprc.c index 662acb519a..d4980d3542 100644 --- a/app/gimprc.c +++ b/app/gimprc.c @@ -33,6 +33,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "app_procs.h" diff --git a/app/gradient.c b/app/gradient.c index aa68b79955..ad80b74469 100644 --- a/app/gradient.c +++ b/app/gradient.c @@ -57,6 +57,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gradient_editor.c b/app/gradient_editor.c index aa68b79955..ad80b74469 100644 --- a/app/gradient_editor.c +++ b/app/gradient_editor.c @@ -57,6 +57,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/channels-dialog.c b/app/gui/channels-dialog.c index b7e55dda2f..a7404ed2f5 100644 --- a/app/gui/channels-dialog.c +++ b/app/gui/channels-dialog.c @@ -21,6 +21,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/colormap-dialog.c b/app/gui/colormap-dialog.c index eff0e69f72..b523e234f3 100644 --- a/app/gui/colormap-dialog.c +++ b/app/gui/colormap-dialog.c @@ -25,6 +25,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "color_notebook.h" diff --git a/app/gui/commands.c b/app/gui/commands.c index d4c44a19c0..c2bb5fecdc 100644 --- a/app/gui/commands.c +++ b/app/gui/commands.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/device-status-dialog.c b/app/gui/device-status-dialog.c index 3f7f2e91f6..58cc442536 100644 --- a/app/gui/device-status-dialog.c +++ b/app/gui/device-status-dialog.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/gradient-editor.c b/app/gui/gradient-editor.c index aa68b79955..ad80b74469 100644 --- a/app/gui/gradient-editor.c +++ b/app/gui/gradient-editor.c @@ -57,6 +57,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/help-commands.c b/app/gui/help-commands.c index d4c44a19c0..c2bb5fecdc 100644 --- a/app/gui/help-commands.c +++ b/app/gui/help-commands.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/input-dialog.c b/app/gui/input-dialog.c index 3f7f2e91f6..58cc442536 100644 --- a/app/gui/input-dialog.c +++ b/app/gui/input-dialog.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 7a86623a97..a65c04dd1e 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "color_area.h" diff --git a/app/gui/palette-import-dialog.c b/app/gui/palette-import-dialog.c index d29471cc02..730de5a771 100644 --- a/app/gui/palette-import-dialog.c +++ b/app/gui/palette-import-dialog.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/gui/qmask-commands.c b/app/gui/qmask-commands.c index 9f2959db08..84ea51d51e 100644 --- a/app/gui/qmask-commands.c +++ b/app/gui/qmask-commands.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/libgimp_glue.c b/app/libgimp_glue.c index 9eae56a0f2..ffadd2cdf8 100644 --- a/app/libgimp_glue.c +++ b/app/libgimp_glue.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "gimpcontext.h" diff --git a/app/paint/gimppencil.c b/app/paint/gimppencil.c index 59915c5289..213b375793 100644 --- a/app/paint/gimppencil.c +++ b/app/paint/gimppencil.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/palette.c b/app/palette.c index 7a86623a97..a65c04dd1e 100644 --- a/app/palette.c +++ b/app/palette.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "color_area.h" diff --git a/app/palette_import.c b/app/palette_import.c index d29471cc02..730de5a771 100644 --- a/app/palette_import.c +++ b/app/palette_import.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/qmask.c b/app/qmask.c index 9f2959db08..84ea51d51e 100644 --- a/app/qmask.c +++ b/app/qmask.c @@ -24,6 +24,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c index 59915c5289..213b375793 100644 --- a/app/tools/gimppenciltool.c +++ b/app/tools/gimppenciltool.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/tools/paint_core.c b/app/tools/paint_core.c index d3829c3d68..59c99fe28c 100644 --- a/app/tools/paint_core.c +++ b/app/tools/paint_core.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/tools/paintbrush.c b/app/tools/paintbrush.c index 5d9cee29be..16b2889034 100644 --- a/app/tools/paintbrush.c +++ b/app/tools/paintbrush.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/tools/pencil.c b/app/tools/pencil.c index 59915c5289..213b375793 100644 --- a/app/tools/pencil.c +++ b/app/tools/pencil.c @@ -20,6 +20,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index eff0e69f72..b523e234f3 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -25,6 +25,8 @@ #include #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "color_notebook.h" diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index 3f7f2e91f6..58cc442536 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c index 3f7f2e91f6..58cc442536 100644 --- a/app/widgets/gimpdevices.c +++ b/app/widgets/gimpdevices.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c index 0a409d59e6..fa6e23c76f 100644 --- a/app/widgets/gimpdnd.c +++ b/app/widgets/gimpdnd.c @@ -22,6 +22,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" @@ -44,10 +46,11 @@ #include "libgimp/gimplimits.h" #include "libgimp/gimpcolorarea.h" -#define DRAG_PREVIEW_SIZE 32 +#define DRAG_PREVIEW_SIZE 32 #define DRAG_ICON_OFFSET -8 + typedef enum { GIMP_DND_DATA_COLOR = 1, diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index aa68b79955..ad80b74469 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -57,6 +57,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "appenv.h" diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 7a86623a97..a65c04dd1e 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -23,6 +23,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "color_area.h" diff --git a/app/xcf.c b/app/xcf.c index fea5227c73..2795df6c4c 100644 --- a/app/xcf.c +++ b/app/xcf.c @@ -33,6 +33,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index fea5227c73..2795df6c4c 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -33,6 +33,8 @@ #include +#include "libgimpcolor/gimpcolor.h" + #include "apptypes.h" #include "channel.h" diff --git a/configure.in b/configure.in index 4bfeb3eb90..ce391df5da 100644 --- a/configure.in +++ b/configure.in @@ -732,6 +732,8 @@ gimp.spec libgimp/gimpfeatures.h libgimp/Makefile libgimp/makefile.mingw +libgimpcolor/Makefile +libgimpcolor/makefile.mingw app/Makefile app/makefile.mingw app/pdb/Makefile diff --git a/gimptool-1.2.in b/gimptool-1.2.in index 9f4b8218a3..bc68c45211 100644 --- a/gimptool-1.2.in +++ b/gimptool-1.2.in @@ -203,9 +203,9 @@ while test $# -gt 0; do done case $1 in --libs) - echo $libdirs -lgimpui -lgimp $my_gtk_libs ;; + echo $libdirs -lgimpui -lgimp -lgimpcolor $my_gtk_libs ;; --libs-nogimpui) - echo $libdirs -lgimp $my_gtk_libs ;; + echo $libdirs -lgimp -lgimpcolor $my_gtk_libs ;; esac ;; --libs-noui) diff --git a/gimptool.in b/gimptool.in index 9f4b8218a3..bc68c45211 100644 --- a/gimptool.in +++ b/gimptool.in @@ -203,9 +203,9 @@ while test $# -gt 0; do done case $1 in --libs) - echo $libdirs -lgimpui -lgimp $my_gtk_libs ;; + echo $libdirs -lgimpui -lgimp -lgimpcolor $my_gtk_libs ;; --libs-nogimpui) - echo $libdirs -lgimp $my_gtk_libs ;; + echo $libdirs -lgimp -lgimpcolor $my_gtk_libs ;; esac ;; --libs-noui) diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 8f130dec0d..879eccd09c 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -97,16 +97,12 @@ PDB_WRAPPERS_H = \ gimpunit_pdb.h libgimpi_a_SOURCES = \ - gimpcolor.c \ - gimpcolor.h \ gimpchainbutton.c \ gimpchainbutton.h \ gimpcolorarea.c \ gimpcolorarea.h \ gimpcolorbutton.c \ gimpcolorbutton.h \ - gimpcolorspace.c \ - gimpcolorspace.h \ gimpdialog.c \ gimpdialog.h \ gimpenv.c \ @@ -163,10 +159,6 @@ libgimp_la_SOURCES = \ gimpadaptivesupersample.h \ gimpbilinear.c \ gimpbilinear.h \ - gimpcolor.c \ - gimpcolor.h \ - gimpcolorspace.c \ - gimpcolorspace.h \ gimpchannel.c \ gimpchannel.h \ gimpdrawable.c \ @@ -240,12 +232,10 @@ gimpinclude_HEADERS = \ gimpbilinear.h \ gimpchainbutton.h \ gimpchannel.h \ - gimpcolor.h \ gimpcolorarea.h \ gimpcolorbutton.h \ gimpcolordisplay.h \ gimpcolorselector.h \ - gimpcolorspace.h \ gimpcompat.h \ gimpdrawable.h \ gimpdialog.h \ diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 66e9653bcb..80d1fec2c8 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -137,10 +137,6 @@ EXPORTS gimp_gradients_set_popup gimp_gtkrc gimp_help - gimp_hls_to_rgb - gimp_hsv_to_rgb - gimp_hsv_to_rgb4 - gimp_hsv_to_rgb_double gimp_image_add_channel gimp_image_add_hguide gimp_image_add_layer @@ -325,11 +321,6 @@ EXPORTS gimp_register_load_handler gimp_register_magic_load_handler gimp_register_save_handler - gimp_rgb_to_hls - gimp_rgb_to_hsv - gimp_rgb_to_hsv4 - gimp_rgb_to_hsv_double - gimp_rgb_to_l gimp_rotate gimp_run_procedure gimp_run_procedure2 diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 1fa1b63f78..850b862167 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -24,14 +24,14 @@ #include +#include + #include #include #include #include #include -#include -#include #include #include #include diff --git a/libgimp/gimpadaptivesupersample.c b/libgimp/gimpadaptivesupersample.c index e51adcac31..514db9a583 100644 --- a/libgimp/gimpadaptivesupersample.c +++ b/libgimp/gimpadaptivesupersample.c @@ -21,7 +21,8 @@ #include -#include "gimpcolor.h" +#include "libgimpcolor/gimpcolor.h" + #include "gimpadaptivesupersample.h" #include "gimpmath.h" diff --git a/libgimp/gimpbilinear.c b/libgimp/gimpbilinear.c index b1a8717df4..fc73d07c90 100644 --- a/libgimp/gimpbilinear.c +++ b/libgimp/gimpbilinear.c @@ -21,7 +21,8 @@ #include -#include "gimpcolor.h" +#include "libgimpcolor/gimpcolor.h" + #include "gimpbilinear.h" #include "gimpmath.h" diff --git a/libgimp/gimppalette.c b/libgimp/gimppalette.c index 3720cbdb54..3ef1b556c2 100644 --- a/libgimp/gimppalette.c +++ b/libgimp/gimppalette.c @@ -21,7 +21,8 @@ #include -#include "gimpcolor.h" +#include "libgimpcolor/gimpcolor.h" + #include "gimppalette_pdb.h" diff --git a/libgimp/gimptypes.h b/libgimp/gimptypes.h index 10a0fff229..1556bc8fcd 100644 --- a/libgimp/gimptypes.h +++ b/libgimp/gimptypes.h @@ -23,8 +23,10 @@ #define __GIMP_TYPES_H__ +#include + + /* these will go to a separate library soon */ -#include "gimpcolor.h" #include "gimpunit.h" diff --git a/libgimp/makefile.mingw.in b/libgimp/makefile.mingw.in index 53ac9fcab5..e6b2b70610 100644 --- a/libgimp/makefile.mingw.in +++ b/libgimp/makefile.mingw.in @@ -66,7 +66,6 @@ gimpi_OBJECTS = \ gimpenv.o \ gimpchainbutton.o \ gimpcolorbutton.o \ - gimpcolorspace.o \ gimpdialog.o \ gimpfileselection.o \ gimphelpui.o \ @@ -91,7 +90,6 @@ gimp_OBJECTS = \ gimp.o \ $(PDB_WRAPPERS_O) \ gimpchannel.o \ - gimpcolorspace.o \ gimpdrawable.o \ gimpenv.o \ gimpgradientselect.o \ diff --git a/libgimpcolor/.cvsignore b/libgimpcolor/.cvsignore new file mode 100644 index 0000000000..42de370d9b --- /dev/null +++ b/libgimpcolor/.cvsignore @@ -0,0 +1,8 @@ +Makefile +Makefile.in +makefile.mingw +*.lo +_libs +.libs +.deps +*.la diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am new file mode 100644 index 0000000000..250591f8d3 --- /dev/null +++ b/libgimpcolor/Makefile.am @@ -0,0 +1,57 @@ +## Process this file with automake to produce Makefile.in + +libgimpcolorincludedir = $(includedir)/libgimpcolor + +AM_CPPFLAGS = \ + -DGIMPDIR=\""$(gimpdir)"\" \ + -DDATADIR=\""$(gimpdatadir)"\" \ + -DSYSCONFDIR=\""$(gimpsysconfdir)"\" \ + -DG_LOG_DOMAIN=\"LibGimpColor\" \ + @GIMP_THREAD_FLAGS@ + +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ + -I../intl \ + $(GTK_CFLAGS) \ + -I$(includedir) + +EXTRA_DIST = \ + makefile.mingw \ + makefile.mingw.in \ + makefile.msc \ + gimpcolor.def + +lib_LTLIBRARIES = libgimpcolor.la + +libgimpcolor_la_SOURCES = \ + gimpcolor.h \ + gimpcolortypes.h \ + gimpcolorspace.c \ + gimpcolorspace.h \ + gimphsv.c \ + gimphsv.h \ + gimprgb.c \ + gimprgb.h + +libgimpcolorinclude_HEADERS = \ + gimpcolor.h \ + gimpcolortypes.h \ + gimpcolorspace.h \ + gimphsv.h \ + gimprgb.h + +libgimpcolor_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) +libgimpcolor_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 diff --git a/libgimpcolor/gimpadaptivesupersample.c b/libgimpcolor/gimpadaptivesupersample.c index e51adcac31..514db9a583 100644 --- a/libgimpcolor/gimpadaptivesupersample.c +++ b/libgimpcolor/gimpadaptivesupersample.c @@ -21,7 +21,8 @@ #include -#include "gimpcolor.h" +#include "libgimpcolor/gimpcolor.h" + #include "gimpadaptivesupersample.h" #include "gimpmath.h" diff --git a/libgimpcolor/gimpbilinear.c b/libgimpcolor/gimpbilinear.c index b1a8717df4..fc73d07c90 100644 --- a/libgimpcolor/gimpbilinear.c +++ b/libgimpcolor/gimpbilinear.c @@ -21,7 +21,8 @@ #include -#include "gimpcolor.h" +#include "libgimpcolor/gimpcolor.h" + #include "gimpbilinear.h" #include "gimpmath.h" diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def new file mode 100644 index 0000000000..eda5b6634a --- /dev/null +++ b/libgimpcolor/gimpcolor.def @@ -0,0 +1,10 @@ +EXPORTS + gimp_hls_to_rgb + gimp_hsv_to_rgb + gimp_hsv_to_rgb4 + gimp_hsv_to_rgb_double + gimp_rgb_to_hls + gimp_rgb_to_hsv + gimp_rgb_to_hsv4 + gimp_rgb_to_hsv_double + gimp_rgb_to_l diff --git a/libgimpcolor/gimpcolor.h b/libgimpcolor/gimpcolor.h new file mode 100644 index 0000000000..5e71dcc8dd --- /dev/null +++ b/libgimpcolor/gimpcolor.h @@ -0,0 +1,31 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GIMP_COLOR_H__ +#define __GIMP_COLOR_H__ + + +#include + +#include +#include +#include + + +#endif /* __GIMP_COLOR_H__ */ diff --git a/libgimp/gimpcolorspace.c b/libgimpcolor/gimpcolorspace.c similarity index 99% rename from libgimp/gimpcolorspace.c rename to libgimpcolor/gimpcolorspace.c index efeb51355a..e496d1016c 100644 --- a/libgimp/gimpcolorspace.c +++ b/libgimpcolor/gimpcolorspace.c @@ -17,11 +17,17 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include -#include "gimpcolor.h" +#include "gimpcolortypes.h" + #include "gimpcolorspace.h" -#include "gimpmath.h" +#include "gimprgb.h" +#include "gimphsv.h" + +#include "libgimp/gimpmath.h" #define GIMP_HSV_UNDEFINED -1.0 diff --git a/libgimp/gimpcolorspace.h b/libgimpcolor/gimpcolorspace.h similarity index 93% rename from libgimp/gimpcolorspace.h rename to libgimpcolor/gimpcolorspace.h index ba1610c07a..b3923d5122 100644 --- a/libgimp/gimpcolorspace.h +++ b/libgimpcolor/gimpcolorspace.h @@ -97,16 +97,6 @@ void gimp_hsv_to_rgb4 (guchar *rgb, gdouble value); -/* Map RGB to intensity */ - -#define INTENSITY_RED 0.30 -#define INTENSITY_GREEN 0.59 -#define INTENSITY_BLUE 0.11 -#define INTENSITY(r,g,b) ((r) * INTENSITY_RED + \ - (g) * INTENSITY_GREEN + \ - (b) * INTENSITY_BLUE + 0.001) - - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpcolor/gimpcolortypes.h b/libgimpcolor/gimpcolortypes.h new file mode 100644 index 0000000000..3e348d556b --- /dev/null +++ b/libgimpcolor/gimpcolortypes.h @@ -0,0 +1,54 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GIMP_COLOR_TYPES_H__ +#define __GIMP_COLOR_TYPES_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + + +/* usually we don't keep the structure definitions in the types file + * but GimpRGB appears in too many header files... + */ + +typedef struct _GimpRGB GimpRGB; + +struct _GimpRGB +{ + gdouble r, g, b, a; +}; + + +typedef struct _GimpHSV GimpHSV; + +struct _GimpHSV +{ + gdouble h, s, v, a; +}; + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __GIMP_COLOR_TYPES_H__ */ diff --git a/libgimpcolor/gimphsv.c b/libgimpcolor/gimphsv.c new file mode 100644 index 0000000000..f820f2fa7b --- /dev/null +++ b/libgimpcolor/gimphsv.c @@ -0,0 +1,72 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include + +#include "gimpcolortypes.h" + +#include "gimphsv.h" + + +/* HSV functions */ + +void +gimp_hsv_set (GimpHSV *hsv, + gdouble h, + gdouble s, + gdouble v) +{ + g_return_if_fail (hsv != NULL); + + hsv->h = h; + hsv->s = s; + hsv->v = v; +} + +void +gimp_hsv_clamp (GimpHSV *hsv) +{ + g_return_if_fail (hsv != NULL); + + hsv->h -= (gint) hsv->h; + + if (hsv->h < 0) + hsv->h += 1.0; + + hsv->s = CLAMP (hsv->s, 0.0, 1.0); + hsv->v = CLAMP (hsv->v, 0.0, 1.0); + hsv->a = CLAMP (hsv->a, 0.0, 1.0); +} + +void +gimp_hsva_set (GimpHSV *hsva, + gdouble h, + gdouble s, + gdouble v, + gdouble a) +{ + g_return_if_fail (hsva != NULL); + + hsva->h = h; + hsva->s = s; + hsva->v = v; + hsva->a = a; +} diff --git a/libgimpcolor/gimphsv.h b/libgimpcolor/gimphsv.h new file mode 100644 index 0000000000..d76b4363fa --- /dev/null +++ b/libgimpcolor/gimphsv.h @@ -0,0 +1,47 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GIMP_HSV_H__ +#define __GIMP_HSV_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + + +void gimp_hsv_set (GimpHSV *hsv, + gdouble h, + gdouble s, + gdouble v); +void gimp_hsv_clamp (GimpHSV *hsv); + +void gimp_hsva_set (GimpHSV *hsva, + gdouble h, + gdouble s, + gdouble v, + gdouble a); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __GIMP_HSV_H__ */ diff --git a/libgimp/gimpcolor.c b/libgimpcolor/gimprgb.c similarity index 88% rename from libgimp/gimpcolor.c rename to libgimpcolor/gimprgb.c index 16149f0cb9..5a84fccb50 100644 --- a/libgimp/gimpcolor.c +++ b/libgimpcolor/gimprgb.c @@ -21,15 +21,11 @@ #include -#include "gimpcolor.h" -#include "gimpcolorspace.h" -#include "gimppalette_pdb.h" -#include "gimpmath.h" +#include "gimpcolortypes.h" +#include "gimprgb.h" -/*************************** - * channels operations * - ***************************/ +#include "libgimp/gimpmath.h" /* RGB functions */ @@ -322,50 +318,3 @@ gimp_rgba_distance (const GimpRGB *rgba1, return (fabs (rgba1->r - rgba2->r) + fabs (rgba1->g - rgba2->g) + fabs (rgba1->b - rgba2->b) + fabs (rgba1->a - rgba2->a)); } - - -/* HSV functions */ - -void -gimp_hsv_set (GimpHSV *hsv, - gdouble h, - gdouble s, - gdouble v) -{ - g_return_if_fail (hsv != NULL); - - hsv->h = h; - hsv->s = s; - hsv->v = v; -} - -void -gimp_hsv_clamp (GimpHSV *hsv) -{ - g_return_if_fail (hsv != NULL); - - hsv->h -= (gint) hsv->h; - - if (hsv->h < 0) - hsv->h += 1.0; - - hsv->s = CLAMP (hsv->s, 0.0, 1.0); - hsv->v = CLAMP (hsv->v, 0.0, 1.0); - hsv->a = CLAMP (hsv->a, 0.0, 1.0); -} - -void -gimp_hsva_set (GimpHSV *hsva, - gdouble h, - gdouble s, - gdouble v, - gdouble a) -{ - g_return_if_fail (hsva != NULL); - - hsva->h = h; - hsva->s = s; - hsva->v = v; - hsva->a = a; -} - diff --git a/libgimp/gimpcolor.h b/libgimpcolor/gimprgb.h similarity index 85% rename from libgimp/gimpcolor.h rename to libgimpcolor/gimprgb.h index c6ba569c11..883fad878e 100644 --- a/libgimp/gimpcolor.h +++ b/libgimpcolor/gimprgb.h @@ -17,8 +17,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GIMP_COLOR_H__ -#define __GIMP_COLOR_H__ +#ifndef __GIMP_RGB_H__ +#define __GIMP_RGB_H__ #ifdef __cplusplus extern "C" { @@ -29,19 +29,6 @@ extern "C" { /* RGB and RGBA color types and operations taken from LibGCK */ -typedef struct _GimpRGB GimpRGB; - -struct _GimpRGB -{ - gdouble r, g, b, a; -}; - -typedef struct _GimpHSV GimpHSV; - -struct _GimpHSV -{ - gdouble h, s, v, a; -}; typedef enum { @@ -111,21 +98,19 @@ void gimp_rgba_multiply (GimpRGB *rgba, gdouble gimp_rgba_distance (const GimpRGB *rgba1, const GimpRGB *rgba2); -void gimp_hsv_set (GimpHSV *hsv, - gdouble h, - gdouble s, - gdouble v); -void gimp_hsv_clamp (GimpHSV *hsv); -void gimp_hsva_set (GimpHSV *hsva, - gdouble h, - gdouble s, - gdouble v, - gdouble a); +/* Map RGB to intensity */ + +#define INTENSITY_RED 0.30 +#define INTENSITY_GREEN 0.59 +#define INTENSITY_BLUE 0.11 +#define INTENSITY(r,g,b) ((r) * INTENSITY_RED + \ + (g) * INTENSITY_GREEN + \ + (b) * INTENSITY_BLUE + 0.001) #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMP_COLOR_H__ */ +#endif /* __GIMP_RGB_H__ */ diff --git a/libgimpcolor/makefile.mingw.in b/libgimpcolor/makefile.mingw.in new file mode 100644 index 0000000000..53ac9fcab5 --- /dev/null +++ b/libgimpcolor/makefile.mingw.in @@ -0,0 +1,148 @@ +## Makefile for building the GIMP DLLs and LIBs with gcc on Win32. +## You should use GNU make running on cygwin. +## Use: make -f makefile.mingw + +TOP = ../.. + +include ../build/win32/make.mingw + +# Possibly override GIMP version from build/win32/module.defs +GIMP_VER = @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@ + +################################################################ + +# The name of the directory in your %HOME% where the GIMP's personal settings +# and stuff is saved. +GIMPDIR = _gimp$(GIMP_VER) + +INCLUDES = -I .. +DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) +DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" + +all : \ + ../config.h \ + libgimpi.a \ + gimp-$(GIMP_VER).dll \ + gimpui-$(GIMP_VER).dll + +../config.h : ../config.h.win32 + cp $< $@ + +PDB_WRAPPERS_O = \ + gimpbrushes_pdb.o \ + gimpbrushselect_pdb.o \ + gimpchannel_pdb.o \ + gimpchannelops_pdb.o \ + gimpcolor_pdb.o \ + gimpconvert_pdb.o \ + gimpdisplay_pdb.o \ + gimpdrawable_pdb.o \ + gimpedit_pdb.o \ + gimpfileops_pdb.o \ + gimpfloatingsel_pdb.o \ + gimpgimprc_pdb.o \ + gimpgradients_pdb.o \ + gimpgradientselect_pdb.o \ + gimpguides_pdb.o \ + gimphelp_pdb.o \ + gimpimage_pdb.o \ + gimplayer_pdb.o \ + gimpmessage_pdb.o \ + gimpmisc_pdb.o \ + gimppalette_pdb.o \ + gimpparasite_pdb.o \ + gimppaths_pdb.o \ + gimppatterns_pdb.o \ + gimppatternselect_pdb.o \ + gimpplugin_pdb.o \ + gimpproceduraldb_pdb.o \ + gimpselection_pdb.o \ + gimptexttool_pdb.o \ + gimptools_pdb.o \ + gimpundo_pdb.o \ + gimpunit_pdb.o + +gimpi_OBJECTS = \ + gimpenv.o \ + gimpchainbutton.o \ + gimpcolorbutton.o \ + gimpcolorspace.o \ + gimpdialog.o \ + gimpfileselection.o \ + gimphelpui.o \ + gimpmatrix.o \ + gimpparasite.o \ + gimpparasiteio.o \ + gimppatheditor.o \ + gimppixmap.o \ + gimpprotocol.o \ + gimpquerybox.o \ + gimpsizeentry.o \ + gimpunitmenu.o \ + gimputils.o \ + gimpvector.o \ + gimpwidgets.o \ + gimpwire.o + +libgimpi.a : $(gimpi_OBJECTS) + ar cr libgimpi.a $(gimpi_OBJECTS) + +gimp_OBJECTS = \ + gimp.o \ + $(PDB_WRAPPERS_O) \ + gimpchannel.o \ + gimpcolorspace.o \ + gimpdrawable.o \ + gimpenv.o \ + gimpgradientselect.o \ + gimphelp.o \ + gimpimage.o \ + gimplayer.o \ + gimpmatrix.o \ + gimpparasite.o \ + gimpparasiteio.o \ + gimppixelrgn.o \ + gimpproceduraldb.o \ + gimpprotocol.o \ + gimpselection.o \ + gimptile.o \ + gimpunit.o \ + gimpvector.o \ + gimpwire.o + +gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def + $(GLIB)/build-dll gimp $(GIMP_VER) gimp.def -s $(gimp_OBJECTS) $(INTL_LIBS) $(GLIB_LIBS) -luser32 + +# Pass -DLIBGIMP_COMPILATION when compiling gimp.c which +# defines the exported variables. + +gimp.o : gimp.c + $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c + +gimpui_OBJECTS = \ + gimpmenu.o \ + gimpbrushmenu.o \ + gimpchainbutton.o \ + gimpcolorbutton.o \ + gimpdialog.o \ + gimpexport.o \ + gimpfileselection.o \ + gimphelpui.o \ + gimpgradientmenu.o \ + gimppatheditor.o \ + gimppatternmenu.o \ + gimppixmap.o \ + gimpquerybox.o \ + gimpsizeentry.o \ + gimpui.o \ + gimpunitmenu.o \ + gimpwidgets.o + +gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def + $(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) + +# Hack to get an updated makefile.mingw automatically after updating +# makefile.mingw.in. Only for developer use. +makefile.mingw: makefile.mingw.in + sed -e 's,@GIMP[_]MAJOR_VERSION@,@GIMP_MAJOR_VERSION@,' \ + -e 's,@GIMP[_]MINOR_VERSION@,@GIMP_MINOR_VERSION@,' <$< >$@ diff --git a/libgimpcolor/makefile.msc b/libgimpcolor/makefile.msc new file mode 100644 index 0000000000..e183de78dc --- /dev/null +++ b/libgimpcolor/makefile.msc @@ -0,0 +1,190 @@ +## WARNING: Outdated. + +## Makefile for building the GIMP DLLs and LIBs with Microsoft C. +## Use: nmake -f makefile.msc + +# Change this to wherever you want to install the DLLs. This directory +# should be in your PATH. As these DLLs are for the GIMP and its plug-ins +# only, it probably is best to keep them in the GIMP's bin directory. +BIN = C:\install\gimp\bin + +GIMP_VER = 1.2 + +# The name of the directory in your %HOME% where the GIMP's personal settings +# and stuff is saved. +GIMPDIR = _gimp$(GIMP_VER) + +################################################################ + +# Nothing much configurable below + +!IFNDEF DEBUG +# Full optimization: +OPTIMIZE = -Ox -MD +LINKDEBUG = +!ELSE +# Debugging: +OPTIMIZE = -Zi -MDd +LINKDEBUG = /debug +!ENDIF + +# cl -? describes the options +CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo + +LDFLAGS = /link $(LINKDEBUG) +INSTALL = copy + +GTK_VER = 1.3 +GLIB_VER = 1.3 + +GTK = ..\..\gtk+ +GLIB = ..\..\glib +INTL = ..\..\intl + +CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" + +all : \ + ..\config.h \ + gimpi.lib \ + gimp-$(GIMP_VER).dll \ + gimpui-$(GIMP_VER).dll + +..\config.h : ..\config.h.win32 + copy ..\config.h.win32 ..\config.h + +install : all + $(INSTALL) gimp-$(GIMP_VER).dll $(BIN) + $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) + +PDB_WRAPPERS_O = \ + gimpbrushes_pdb.obj \ + gimpbrushselect_pdb.obj \ + gimpchannel_pdb.obj \ + gimpchannelops_pdb.obj \ + gimpcolor_pdb.obj \ + gimpconvert_pdb.obj \ + gimpdisplay_pdb.obj \ + gimpdrawable_pdb.obj \ + gimpedit_pdb.obj \ + gimpfileops_pdb.obj \ + gimpfloatingsel_pdb.obj \ + gimpgimprc_pdb.obj \ + gimpgradients_pdb.obj \ + gimpgradientselect_pdb.obj \ + gimpguides_pdb.obj \ + gimphelp_pdb.obj \ + gimpimage_pdb.obj \ + gimplayer_pdb.obj \ + gimpmessage_pdb.obj \ + gimppalette_pdb.obj \ + gimpparasite_pdb.obj \ + gimppatterns_pdb.obj \ + gimppatternselect_pdb.obj \ + gimpplugin_pdb.obj \ + gimpproceduraldb_pdb.obj \ + gimpselection_pdb.obj \ + gimptexttool_pdb.obj \ + gimptools_pdb.obj \ + gimpundo_pdb.obj \ + gimpunit_pdb.obj + +gimpi_OBJECTS = \ + gimpenv.obj \ + gimpchainbutton.obj \ + gimpcolorbutton.obj \ + gimpcolorspace.obj \ + gimpdialog.obj \ + gimpfileselection.obj \ + gimphelpui.obj \ + gimpmatrix.obj \ + gimpparasite.obj \ + gimpparasiteio.obj \ + gimppatheditor.obj \ + gimppixmap.obj \ + gimpprotocol.obj \ + gimpquerybox.obj \ + gimpsizeentry.obj \ + gimpunitmenu.obj \ + gimputils.c \ + gimpvector.obj \ + gimpwidgets.obj \ + gimpwire.obj + +gimpi.lib : $(gimpi_OBJECTS) + lib /out:gimpi.lib $(gimpi_OBJECTS) + +gimp_OBJECTS = \ + gimp.obj \ + $(PDB_WRAPPERS_O) \ + gimpchannel.obj \ + gimpcolorspace.obj \ + gimpdrawable.obj \ + gimpenv.obj \ + gimpgradientselect.obj \ + gimphelp.obj \ + gimpimage.obj \ + gimplayer.obj \ + gimpmatrix.obj \ + gimpparasite.obj \ + gimpparasiteio.obj \ + gimppixelrgn.obj \ + gimpproceduraldb.obj \ + gimpprotocol.obj \ + gimpselection.obj \ + gimptile.obj \ + gimpunit.obj \ + gimpvector.obj \ + gimpwire.obj + +gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def + $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def + +# Pass -DLIBGIMP_COMPILATION when compiling gimp.c + +gimp.obj : gimp.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c + +gimpui_OBJECTS = \ + gimpmenu.obj \ + gimpbrushmenu.obj \ + gimpchainbutton.obj \ + gimpcolorbutton.obj \ + gimpdialog.obj \ + gimpexport.obj \ + gimpfileselection.obj \ + gimphelpui.obj \ + gimpgradientmenu.obj \ + gimppatheditor.obj \ + gimppatternmenu.obj \ + gimppixmap.obj \ + gimpquerybox.obj \ + gimpsizeentry.obj \ + gimpui.obj \ + gimpunitmenu.obj \ + gimpwidgets.obj + +gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def + $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def + +gimpmenu.obj : gimpmenu.c + $(CC) $(CFLAGS) -GD -c gimpmenu.c + +gimpbrushmenu.obj : gimpbrushmenu.c + $(CC) $(CFLAGS) -GD -c gimpbrushmenu.c + +gimpgradientmenu.obj : gimpgradientmenu.c + $(CC) $(CFLAGS) -GD -c gimpgradientmenu.c + +gimppatternmenu.obj : gimppatternmenu.c + $(CC) $(CFLAGS) -GD -c gimppatternmenu.c + +# General rule for compiling, used by the objects that don't go into +# gimp-$(GIMP_VER).dll. +.c.obj: + $(CC) $(CFLAGS) -c $< +clean: + del *.exe + del *.obj + del *.exp + del *.err + del *.map diff --git a/plug-ins/FractalExplorer/Makefile.am b/plug-ins/FractalExplorer/Makefile.am index 089e872fb1..450e3468cf 100644 --- a/plug-ins/FractalExplorer/Makefile.am +++ b/plug-ins/FractalExplorer/Makefile.am @@ -26,9 +26,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/Lighting/Makefile.am index 0b551e4998..2d4eb36ede 100644 --- a/plug-ins/Lighting/Makefile.am +++ b/plug-ins/Lighting/Makefile.am @@ -40,6 +40,7 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ $(top_builddir)/plug-ins/libgck/gck/libgck.la \ $(GTK_LIBS) \ $(INTLLIBS) diff --git a/plug-ins/MapObject/Makefile.am b/plug-ins/MapObject/Makefile.am index 12dd0800b8..96aeb4aa70 100644 --- a/plug-ins/MapObject/Makefile.am +++ b/plug-ins/MapObject/Makefile.am @@ -39,6 +39,7 @@ INCLUDES = \ LDADD = \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ $(top_builddir)/plug-ins/libgck/gck/libgck.la \ $(GTK_LIBS) \ $(INTLLIBS) diff --git a/plug-ins/bmp/Makefile.am b/plug-ins/bmp/Makefile.am index 976d6afe5f..4e5c9215fe 100644 --- a/plug-ins/bmp/Makefile.am +++ b/plug-ins/bmp/Makefile.am @@ -19,9 +19,10 @@ AM_CPPFLAGS = \ -DLOCALEDIR=\""$(localedir)"\" LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 408c533f2e..66a14b4144 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -167,1140 +167,1268 @@ AlienMap_SOURCES = \ AlienMap.c AlienMap_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) AlienMap2_SOURCES = \ AlienMap2.c AlienMap2_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) CEL_SOURCES = \ CEL.c CEL_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) CML_explorer_SOURCES = \ CML_explorer.c CML_explorer_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) aa_SOURCES = \ aa.c aa_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBAA) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBAA) \ + $(GTK_LIBS) \ $(INTLLIBS) align_layers_SOURCES = \ align_layers.c align_layers_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) animationplay_SOURCES = \ animationplay.c animationplay_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) animoptimize_SOURCES = \ animoptimize.c animoptimize_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) apply_lens_SOURCES = \ apply_lens.c apply_lens_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) autocrop_SOURCES = \ autocrop.c autocrop_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) autostretch_hsv_SOURCES = \ autostretch_hsv.c autostretch_hsv_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) blinds_SOURCES = \ blinds.c blinds_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) blur_SOURCES = \ blur.c blur_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) borderaverage_SOURCES = \ borderaverage.c borderaverage_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) bumpmap_SOURCES = \ bumpmap.c bumpmap_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) bz2_SOURCES = \ bz2.c bz2_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) c_astretch_SOURCES = \ c_astretch.c c_astretch_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) checkerboard_SOURCES = \ checkerboard.c checkerboard_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) color_enhance_SOURCES = \ color_enhance.c color_enhance_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) colorify_SOURCES = \ colorify.c colorify_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) colortoalpha_SOURCES = \ colortoalpha.c colortoalpha_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) compose_SOURCES = \ compose.c compose_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) convmatrix_SOURCES = \ convmatrix.c convmatrix_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) csource_SOURCES = \ csource.c csource_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) cubism_SOURCES = \ cubism.c cubism_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) curve_bend_SOURCES = \ curve_bend.c curve_bend_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) decompose_SOURCES = \ decompose.c decompose_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) deinterlace_SOURCES = \ deinterlace.c deinterlace_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) depthmerge_SOURCES = \ depthmerge.c depthmerge_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) despeckle_SOURCES = \ despeckle.c despeckle_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) destripe_SOURCES = \ destripe.c destripe_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) diffraction_SOURCES = \ diffraction.c diffraction_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) displace_SOURCES = \ displace.c displace_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) edge_SOURCES = \ edge.c edge_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) emboss_SOURCES = \ emboss.c emboss_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) engrave_SOURCES = \ engrave.c engrave_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) exchange_SOURCES = \ exchange.c exchange_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) film_SOURCES = \ film.c film_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) flarefx_SOURCES = \ flarefx.c flarefx_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) fractaltrace_SOURCES = \ fractaltrace.c fractaltrace_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gauss_iir_SOURCES = \ gauss_iir.c gauss_iir_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gauss_rle_SOURCES = \ gauss_rle.c gauss_rle_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gbr_SOURCES = \ gbr.c gbr_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gee_SOURCES = \ gee.c gee_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gee_zoom_SOURCES = \ gee_zoom.c gee_zoom_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gicon_SOURCES = \ gicon.c gicon_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gif_SOURCES = \ gif.c gif_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gifload_SOURCES = \ gifload.c gifload_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gih_SOURCES = \ gih.c gih_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) glasstile_SOURCES = \ glasstile.c glasstile_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gqbist_SOURCES = \ gqbist.c gqbist_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gradmap_SOURCES = \ gradmap.c gradmap_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) grid_SOURCES = \ grid.c grid_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gtm_SOURCES = \ gtm.c gtm_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) guillotine_SOURCES = \ guillotine.c guillotine_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) gz_SOURCES = \ gz.c gz_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) header_SOURCES = \ header.c header_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) hot_SOURCES = \ hot.c hot_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) hrz_SOURCES = \ hrz.c hrz_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) illusion_SOURCES = \ illusion.c illusion_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) iwarp_SOURCES = \ iwarp.c iwarp_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) jigsaw_SOURCES = \ jigsaw.c jigsaw_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) jpeg_SOURCES = \ jpeg.c jpeg_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBJPEG) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBJPEG) \ + $(GTK_LIBS) \ $(INTLLIBS) laplace_SOURCES = \ laplace.c laplace_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) lic_SOURCES = \ lic.c lic_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) mail_SOURCES = \ mail.c mail_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) mapcolor_SOURCES = \ mapcolor.c mapcolor_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) max_rgb_SOURCES = \ max_rgb.c max_rgb_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) mblur_SOURCES = \ mblur.c mblur_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) mpeg_SOURCES = \ mpeg.c mpeg_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBMPEG) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBMPEG) \ + $(GTK_LIBS) \ $(INTLLIBS) newsprint_SOURCES = \ newsprint.c newsprint_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) nlfilt_SOURCES = \ nlfilt.c nlfilt_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) noisify_SOURCES = \ noisify.c noisify_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) normalize_SOURCES = \ normalize.c normalize_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) nova_SOURCES = \ nova.c nova_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) oilify_SOURCES = \ oilify.c oilify_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) papertile_SOURCES = \ papertile.c papertile_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) pat_SOURCES = \ pat.c pat_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) pcx_SOURCES = \ pcx.c pcx_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) pix_SOURCES = \ pix.c pix_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) pixelize_SOURCES = \ pixelize.c pixelize_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) plasma_SOURCES = \ plasma.c plasma_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) plugindetails_SOURCES = \ plugindetails.c plugindetails_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) png_SOURCES = \ png.c png_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBPNG) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBPNG) \ + $(GTK_LIBS) \ $(INTLLIBS) pnm_SOURCES = \ pnm.c pnm_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) polar_SOURCES = \ polar.c polar_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) ps_SOURCES = \ ps.c ps_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) psd_SOURCES = \ psd.c psd_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) psp_SOURCES = \ psp.c psp_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBZ) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBZ) \ + $(GTK_LIBS) \ $(INTLLIBS) randomize_SOURCES = \ randomize.c randomize_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) ripple_SOURCES = \ ripple.c ripple_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) rotate_SOURCES = \ rotate.c rotate_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) sample_colorize_SOURCES = \ sample_colorize.c sample_colorize_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) scatter_hsv_SOURCES = \ scatter_hsv.c scatter_hsv_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) screenshot_SOURCES = \ screenshot.c screenshot_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) sel_gauss_SOURCES = \ sel_gauss.c sel_gauss_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) semiflatten_SOURCES = \ semiflatten.c semiflatten_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) sharpen_SOURCES = \ sharpen.c sharpen_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) shift_SOURCES = \ shift.c shift_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) sinus_SOURCES = \ sinus.c sinus_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) smooth_palette_SOURCES = \ smooth_palette.c smooth_palette_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) snoise_SOURCES = \ snoise.c snoise_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) sobel_SOURCES = \ sobel.c sobel_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) sparkle_SOURCES = \ sparkle.c sparkle_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) spread_SOURCES = \ spread.c spread_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) struc_SOURCES = \ struc.c struc_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) sunras_SOURCES = \ sunras.c sunras_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) tga_SOURCES = \ tga.c tga_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) threshold_alpha_SOURCES = \ threshold_alpha.c threshold_alpha_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) tiff_SOURCES = \ tiff.c tiff_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBTIFF) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBTIFF) \ + $(GTK_LIBS) \ $(INTLLIBS) tile_SOURCES = \ tile.c tile_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) tileit_SOURCES = \ tileit.c tileit_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) tiler_SOURCES = \ tiler.c tiler_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) uniteditor_SOURCES = \ uniteditor.c uniteditor_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) unsharp_SOURCES = \ unsharp.c unsharp_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) url_SOURCES = \ url.c url_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) video_SOURCES = \ video.c video_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) vinvert_SOURCES = \ vinvert.c vinvert_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) vpropagate_SOURCES = \ vpropagate.c vpropagate_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) warp_SOURCES = \ warp.c warp_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) waves_SOURCES = \ waves.c waves_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) whirlpinch_SOURCES = \ whirlpinch.c whirlpinch_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) wind_SOURCES = \ wind.c wind_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) wmf_SOURCES = \ wmf.c wmf_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) xbm_SOURCES = \ xbm.c xbm_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) xpm_SOURCES = \ xpm.c xpm_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBXPM) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBXPM) \ + $(GTK_LIBS) \ $(INTLLIBS) xwd_SOURCES = \ xwd.c xwd_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) zealouscrop_SOURCES = \ zealouscrop.c zealouscrop_LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index ff581006e0..ef12c7b30c 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -81,14 +81,16 @@ foreach (sort keys %plugins) { $libgimp .= "\$(top_builddir)/libgimp/libgimp.la"; if (exists $plugins{$_}->{ui}) { - $libgimp .= "\t\\\n\t$libgimp"; + $libgimp .= "\t\t\\\n\t$libgimp"; $libgimp =~ s/gimp\./gimpui./; } + $libgimp .= "\t\t\\\n\t\$(top_builddir)/libgimpcolor/libgimpcolor.la"; + my $optlib = ""; if (exists $plugins{$_}->{optional}) { my $name = exists $plugins{$_}->{libopt} ? $plugins{$_}->{libopt} : $_; - $optlib = "\n\t\$(LIB\U$name\E)\t\t\t\t\\"; + $optlib = "\n\t\$(LIB\U$name\E)\t\t\t\t\t\\"; } if (exists $plugins{$_}->{libsupp}) { @@ -96,7 +98,6 @@ foreach (sort keys %plugins) { foreach $lib (@lib) { $libgimp = "\$(top_builddir)/plug-ins/$lib/lib$lib.a\t\\\n\t$libgimp"; } - $libgimp =~ s@gck/libgck\.a@libgck/gck/libgck.la@; } print MK <{libdep}\E_LIBS) \\ + \$(\U$plugins{$_}->{libdep}\E_LIBS) \\ \$(INTLLIBS) EOT diff --git a/plug-ins/dbbrowser/Makefile.am b/plug-ins/dbbrowser/Makefile.am index 364454135e..5f83457416 100644 --- a/plug-ins/dbbrowser/Makefile.am +++ b/plug-ins/dbbrowser/Makefile.am @@ -20,9 +20,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/faxg3/Makefile.am b/plug-ins/faxg3/Makefile.am index 251ee570ed..ad2b81ff78 100644 --- a/plug-ins/faxg3/Makefile.am +++ b/plug-ins/faxg3/Makefile.am @@ -19,8 +19,9 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimp.la \ - $(GLIB_LIBS) \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GLIB_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/fits/Makefile.am b/plug-ins/fits/Makefile.am index 44510c738a..92a6e48835 100644 --- a/plug-ins/fits/Makefile.am +++ b/plug-ins/fits/Makefile.am @@ -15,9 +15,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) AM_CPPFLAGS = \ diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am index 6f202f4923..10a0f5d85f 100644 --- a/plug-ins/flame/Makefile.am +++ b/plug-ins/flame/Makefile.am @@ -23,10 +23,11 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ - $(LIBUCB) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ + $(LIBUCB) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/fp/Makefile.am b/plug-ins/fp/Makefile.am index a79b6430e0..4901938cf5 100644 --- a/plug-ins/fp/Makefile.am +++ b/plug-ins/fp/Makefile.am @@ -20,9 +20,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/gap/Makefile.am b/plug-ins/gap/Makefile.am index 6fd0a2c865..b490870d8a 100644 --- a/plug-ins/gap/Makefile.am +++ b/plug-ins/gap/Makefile.am @@ -209,16 +209,18 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) gap_decode_mpeg_LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(LIBMPEG) \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(LIBMPEG) \ + $(GTK_LIBS) \ $(INTLLIBS) files: diff --git a/plug-ins/gdyntext/Makefile.am b/plug-ins/gdyntext/Makefile.am index 8c79b7372c..caa1dc0ac6 100644 --- a/plug-ins/gdyntext/Makefile.am +++ b/plug-ins/gdyntext/Makefile.am @@ -52,9 +52,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) AM_CPPFLAGS = \ diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am index d77b903a9c..5f49cdf27d 100644 --- a/plug-ins/gfig/Makefile.am +++ b/plug-ins/gfig/Makefile.am @@ -21,9 +21,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/gflare/Makefile.am b/plug-ins/gflare/Makefile.am index 3857fbaf6d..9f003366bf 100644 --- a/plug-ins/gflare/Makefile.am +++ b/plug-ins/gflare/Makefile.am @@ -22,9 +22,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/gfli/Makefile.am b/plug-ins/gfli/Makefile.am index 3dff5c4e42..712af13ec6 100644 --- a/plug-ins/gfli/Makefile.am +++ b/plug-ins/gfli/Makefile.am @@ -15,9 +15,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) AM_CPPFLAGS = \ diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am index e6d70f44c6..6aa3fdfa92 100644 --- a/plug-ins/gimpressionist/Makefile.am +++ b/plug-ins/gimpressionist/Makefile.am @@ -40,9 +40,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/helpbrowser/Makefile.am b/plug-ins/helpbrowser/Makefile.am index 9f12920ec0..3ef0f6bdb0 100644 --- a/plug-ins/helpbrowser/Makefile.am +++ b/plug-ins/helpbrowser/Makefile.am @@ -18,10 +18,11 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ - $(GTKXMHTML_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ + $(GTKXMHTML_LIBS) \ $(INTLLIBS) AM_CPPFLAGS = \ diff --git a/plug-ins/ifscompose/Makefile.am b/plug-ins/ifscompose/Makefile.am index fcb542d85b..d7e02b6af9 100644 --- a/plug-ins/ifscompose/Makefile.am +++ b/plug-ins/ifscompose/Makefile.am @@ -18,9 +18,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) AM_CPPFLAGS = \ diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am index 868999bb8f..eb9c10ea91 100644 --- a/plug-ins/imagemap/Makefile.am +++ b/plug-ins/imagemap/Makefile.am @@ -172,9 +172,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) AM_CPPFLAGS = \ diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am index ac86de2a8b..f2d315a203 100644 --- a/plug-ins/maze/Makefile.am +++ b/plug-ins/maze/Makefile.am @@ -20,9 +20,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/mosaic/Makefile.am b/plug-ins/mosaic/Makefile.am index 6f061097b5..fc153e34d4 100644 --- a/plug-ins/mosaic/Makefile.am +++ b/plug-ins/mosaic/Makefile.am @@ -17,9 +17,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am index d3fc05f637..61f1014871 100644 --- a/plug-ins/pagecurl/Makefile.am +++ b/plug-ins/pagecurl/Makefile.am @@ -24,9 +24,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am index 71af753ec7..be2c0197b5 100644 --- a/plug-ins/print/Makefile.am +++ b/plug-ins/print/Makefile.am @@ -47,9 +47,10 @@ AM_CPPFLAGS = \ -DRELEASE_DATE=\"$(GIMP_PRINT_RELEASE_DATE)\" LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) escputil_LDADD = diff --git a/plug-ins/rcm/Makefile.am b/plug-ins/rcm/Makefile.am index 2b1edd9fc5..f6cdcdc02b 100644 --- a/plug-ins/rcm/Makefile.am +++ b/plug-ins/rcm/Makefile.am @@ -31,9 +31,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am index 1a5576adac..e413c49187 100644 --- a/plug-ins/script-fu/Makefile.am +++ b/plug-ins/script-fu/Makefile.am @@ -41,6 +41,7 @@ LDADD = \ $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ $(GTK_LIBS) \ $(INTLLIBS) diff --git a/plug-ins/sel2path/Makefile.am b/plug-ins/sel2path/Makefile.am index 6f54da028f..4d599d3d4c 100644 --- a/plug-ins/sel2path/Makefile.am +++ b/plug-ins/sel2path/Makefile.am @@ -40,6 +40,7 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ $(GTK_LIBS) \ $(INTLLIBS) diff --git a/plug-ins/sgi/Makefile.am b/plug-ins/sgi/Makefile.am index b470cf7981..af9da94aae 100644 --- a/plug-ins/sgi/Makefile.am +++ b/plug-ins/sgi/Makefile.am @@ -18,9 +18,10 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ $(INTLLIBS) .PHONY: files diff --git a/plug-ins/webbrowser/Makefile.am b/plug-ins/webbrowser/Makefile.am index 1c721bf449..ea7b7f4134 100644 --- a/plug-ins/webbrowser/Makefile.am +++ b/plug-ins/webbrowser/Makefile.am @@ -20,10 +20,11 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ - $(LIBXMU) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ + $(LIBXMU) \ $(INTLLIBS) EXTRA_DIST = $(scriptdata_DATA) diff --git a/plug-ins/xjt/Makefile.am b/plug-ins/xjt/Makefile.am index 5909e42f5e..ced1ffa29c 100644 --- a/plug-ins/xjt/Makefile.am +++ b/plug-ins/xjt/Makefile.am @@ -19,10 +19,11 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(GTK_LIBS) \ - $(LIBJPEG) \ + $(top_builddir)/libgimp/libgimpui.la \ + $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimpcolor/libgimpcolor.la \ + $(GTK_LIBS) \ + $(LIBJPEG) \ $(INTLLIBS) AM_CPPFLAGS = \