Commit 7a4260da authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Makefile.am configure.in added the new library below.

2001-01-24  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* configure.in
	* gimptool.in: added the new library below.

	* libgimpwidgets/Makefile.am
	* libgimpwidgets/gimpchainbutton.[ch]
	* libgimpwidgets/gimpcolorarea.[ch]
	* libgimpwidgets/gimpcolorbutton.[ch]
	* libgimpwidgets/gimpdialog.[ch]
	* libgimpwidgets/gimpfileselection.[ch]
	* libgimpwidgets/gimphelpui.[ch]
	* libgimpwidgets/gimppatheditor.[ch]
	* libgimpwidgets/gimppixmap.[ch]
	* libgimpwidgets/gimpquerybox.[ch]
	* libgimpwidgets/gimpsizeentry.[ch]
	* libgimpwidgets/gimpunitmenu.[ch]
	* libgimpwidgets/gimpwidgets.[ch]
	* libgimpwidgets/gimpwidgets.def
	* libgimpwidgets/gimpwidgetstypes.h: new shared library.

	Currently there are some ugly dependencies into libgimp. These
	will be removed and go to a "libgimpglue" library which will be
	a library for functions which share a common interface between
	plug-ins and the app but have different implementations.

	Include "libgimp/gimpunit.h" from "libgimpwidgets/gimpwidgetstypes.h"
	to simulate this upcoming separation.

	* libgimp/Makefile.am
	* libgimp/gimpchainbutton.[ch]
	* libgimp/gimpcolorarea.[ch]
	* libgimp/gimpcolorbutton.[ch]
	* libgimp/gimpdialog.[ch]
	* libgimp/gimpfileselection.[ch]
	* libgimp/gimphelpui.[ch]
	* libgimp/gimppatheditor.[ch]
	* libgimp/gimppixmap.[ch]
	* libgimp/gimpquerybox.[ch]
	* libgimp/gimpsizeentry.[ch]
	* libgimp/gimpunitmenu.[ch]
	* libgimp/gimpwidgets.[ch]: removed from here.

	* libgimp/gimpui.h
	* libgimp/gimpuitypes.h
	* libgimp/makefile.mingw.in
	* libgimp/makefile.msc: changed accordingly.

	* app/[all ui files]
	* app/pdb/palette_cmds.c
	* app/pdb/tools_cmds.c
	* tools/pdbgen/pdb/palette.pdb
	* tools/pdbgen/pdb/tools.pdb: #include "libgimpwidgets/gimpwidgets.h"
	and removed useless includes.

	* app/apptypes.h: #include "libgimpwidgets/gimpwidgetstypes.h"

	* app/Makefile.am
	* plug-ins/[all makefiles which link against libgimpui]:
	link against libgimpwidgets.la

	* po-libgimp/POTFILES.in: changed file locations.
parent 9c132bf8
2001-01-24 Michael Natterer <mitch@gimp.org>
* Makefile.am
* configure.in
* gimptool.in: added the new library below.
* libgimpwidgets/Makefile.am
* libgimpwidgets/gimpchainbutton.[ch]
* libgimpwidgets/gimpcolorarea.[ch]
* libgimpwidgets/gimpcolorbutton.[ch]
* libgimpwidgets/gimpdialog.[ch]
* libgimpwidgets/gimpfileselection.[ch]
* libgimpwidgets/gimphelpui.[ch]
* libgimpwidgets/gimppatheditor.[ch]
* libgimpwidgets/gimppixmap.[ch]
* libgimpwidgets/gimpquerybox.[ch]
* libgimpwidgets/gimpsizeentry.[ch]
* libgimpwidgets/gimpunitmenu.[ch]
* libgimpwidgets/gimpwidgets.[ch]
* libgimpwidgets/gimpwidgets.def
* libgimpwidgets/gimpwidgetstypes.h: new shared library.
Currently there are some ugly dependencies into libgimp. These
will be removed and go to a "libgimpglue" library which will be
a library for functions which share a common interface between
plug-ins and the app but have different implementations.
Include "libgimp/gimpunit.h" from "libgimpwidgets/gimpwidgetstypes.h"
to simulate this upcoming separation.
* libgimp/Makefile.am
* libgimp/gimpchainbutton.[ch]
* libgimp/gimpcolorarea.[ch]
* libgimp/gimpcolorbutton.[ch]
* libgimp/gimpdialog.[ch]
* libgimp/gimpfileselection.[ch]
* libgimp/gimphelpui.[ch]
* libgimp/gimppatheditor.[ch]
* libgimp/gimppixmap.[ch]
* libgimp/gimpquerybox.[ch]
* libgimp/gimpsizeentry.[ch]
* libgimp/gimpunitmenu.[ch]
* libgimp/gimpwidgets.[ch]: removed from here.
* libgimp/gimpui.h
* libgimp/gimpuitypes.h
* libgimp/makefile.mingw.in
* libgimp/makefile.msc: changed accordingly.
* app/[all ui files]
* app/pdb/palette_cmds.c
* app/pdb/tools_cmds.c
* tools/pdbgen/pdb/palette.pdb
* tools/pdbgen/pdb/tools.pdb: #include "libgimpwidgets/gimpwidgets.h"
and removed useless includes.
* app/apptypes.h: #include "libgimpwidgets/gimpwidgetstypes.h"
* app/Makefile.am
* plug-ins/[all makefiles which link against libgimpui]:
link against libgimpwidgets.la
* po-libgimp/POTFILES.in: changed file locations.
2001-01-24 Simon Budig <simon@gimp.org> 2001-01-24 Simon Budig <simon@gimp.org>
* plug-ins/common/colortoalpha.c: wrapped some actions in a * plug-ins/common/colortoalpha.c: wrapped some actions in a
......
...@@ -5,6 +5,7 @@ SUBDIRS = \ ...@@ -5,6 +5,7 @@ SUBDIRS = \
intl \ intl \
libgimpmath \ libgimpmath \
libgimpcolor \ libgimpcolor \
libgimpwidgets \
libgimp \ libgimp \
app \ app \
$(GIMP_PLUGINS) \ $(GIMP_PLUGINS) \
......
...@@ -309,14 +309,15 @@ INCLUDES = \ ...@@ -309,14 +309,15 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
gimp_LDADD = \ gimp_LDADD = \
pdb/libapppdb.la \ pdb/libapppdb.la \
tools/libapptools.la \ tools/libapptools.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \ $(top_builddir)/libgimpcolor/libgimpcolor.la \
$(top_builddir)/libgimpmath/libgimpmath.la \ $(top_builddir)/libgimpmath/libgimpmath.la \
$(top_builddir)/libgimp/libgimpi.a \ $(top_builddir)/libgimpwidgets/libgimpwidgets.la \
$(GTK_LIBS) \ $(top_builddir)/libgimp/libgimpi.a \
$(GIMP_THREAD_LIBS) \ $(GTK_LIBS) \
$(GIMP_MP_LIBS) \ $(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS) $(INTLLIBS)
.PHONY: files .PHONY: files
......
...@@ -27,11 +27,12 @@ ...@@ -27,11 +27,12 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "about_dialog.h"
#include "appenv.h" #include "appenv.h"
#include "about_dialog.h"
#include "authors.h" #include "authors.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimphelp.h" #include "gimphelp.h"
...@@ -39,7 +40,6 @@ ...@@ -39,7 +40,6 @@
#include "libgimp/gimpfeatures.h" #include "libgimp/gimpfeatures.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimphelpui.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
...@@ -80,8 +81,6 @@ ...@@ -80,8 +81,6 @@
#include "tools/tool_options_dialog.h" #include "tools/tool_options_dialog.h"
#include "tools/tools.h" #include "tools/tools.h"
#include "libgimp/gimphelpui.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h"
#include "channel.h" #include "channel.h"
#include "color_panel.h" #include "color_panel.h"
#include "drawable.h" #include "drawable.h"
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h"
#include "global_edit.h" #include "global_edit.h"
#include "qmask.h" #include "qmask.h"
#include "undo.h" #include "undo.h"
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h"
#include "channel.h" #include "channel.h"
#include "color_panel.h" #include "color_panel.h"
#include "drawable.h" #include "drawable.h"
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimpui.h"
#include "global_edit.h" #include "global_edit.h"
#include "qmask.h" #include "qmask.h"
#include "undo.h" #include "undo.h"
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -59,7 +61,6 @@ ...@@ -59,7 +61,6 @@
#include "gimprc.h" #include "gimprc.h"
#include "gimpparasite.h" #include "gimpparasite.h"
#include "gimpset.h" #include "gimpset.h"
#include "gimpui.h"
#include "global_edit.h" #include "global_edit.h"
#include "gradient_select.h" #include "gradient_select.h"
#include "gradient.h" #include "gradient.h"
...@@ -103,7 +104,6 @@ ...@@ -103,7 +104,6 @@
#include "libgimp/gimplimits.h" #include "libgimp/gimplimits.h"
#include "libgimp/gimpfeatures.h" #include "libgimp/gimpfeatures.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimphelpui.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -22,11 +22,7 @@ ...@@ -22,11 +22,7 @@
#include "libgimpcolor/gimpcolortypes.h" #include "libgimpcolor/gimpcolortypes.h"
#include "libgimpmath/gimpmathtypes.h" #include "libgimpmath/gimpmathtypes.h"
#include "libgimp/gimpuitypes.h" #include "libgimpwidgets/gimpwidgetstypes.h"
/* stuff that will go to general-purpose libraries */
#include "libgimp/gimpunit.h"
#include "undo_types.h" #include "undo_types.h"
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
#include "color_balance.h"
#include "color_transfer.h" #include "color_transfer.h"
#include "drawable.h" #include "drawable.h"
#include "gdisplay.h" #include "gdisplay.h"
...@@ -34,8 +34,10 @@ ...@@ -34,8 +34,10 @@
#include "gimpui.h" #include "gimpui.h"
#include "image_map.h" #include "image_map.h"
#include "pixel_region.h" #include "pixel_region.h"
#include "tools.h"
#include "color_balance.h"
#include "tool_options.h" #include "tool_options.h"
#include "tools.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
#include "cursorutil.h" #include "cursorutil.h"
#include "curves.h"
#include "drawable.h" #include "drawable.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimphistogram.h" #include "gimphistogram.h"
...@@ -36,11 +36,12 @@ ...@@ -36,11 +36,12 @@
#include "gimpui.h" #include "gimpui.h"
#include "gimplut.h" #include "gimplut.h"
#include "image_map.h" #include "image_map.h"
#include "tools.h"
#include "curves.h"
#include "tool_options.h" #include "tool_options.h"
#include "tools.h"
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimphelpui.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
...@@ -39,8 +40,6 @@ ...@@ -39,8 +40,6 @@
#include "gimprc.h" #include "gimprc.h"
#include "pixel_processor.h" #include "pixel_processor.h"
#include <libgimp/gimphelpui.h>
struct _GimpHistogram struct _GimpHistogram
{ {
......
...@@ -22,18 +22,19 @@ ...@@ -22,18 +22,19 @@
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "gimage_mask.h" #include "gimage_mask.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpui.h" #include "gimpui.h"
#include "hue_saturation.h"
#include "image_map.h" #include "image_map.h"
#include "pixel_region.h" #include "pixel_region.h"
#include "hue_saturation.h"
#include "tools.h" #include "tools.h"
#include "tool_options.h" #include "tool_options.h"
......
...@@ -20,9 +20,10 @@ ...@@ -20,9 +20,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h"
#include "drawable.h" #include "drawable.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimphistogram.h" #include "gimphistogram.h"
...@@ -32,9 +33,10 @@ ...@@ -32,9 +33,10 @@
#include "image_map.h" #include "image_map.h"
#include "paint_funcs.h" #include "paint_funcs.h"
#include "pixel_region.h" #include "pixel_region.h"
#include "threshold.h" #include "threshold.h"
#include "tools.h"
#include "tool_options.h" #include "tool_options.h"
#include "tools.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -25,17 +25,14 @@ ...@@ -25,17 +25,14 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h"
#include "gimpbrushgenerated.h" #include "gimpbrushgenerated.h"
#include "brush_edit.h" #include "brush_edit.h"
#include "gimpui.h"
#include "temp_buf.h" #include "temp_buf.h"
#include "libgimp/gimphelpui.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -36,7 +38,6 @@ ...@@ -36,7 +38,6 @@
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimplist.h" #include "gimplist.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "session.h" #include "session.h"
#include "temp_buf.h" #include "temp_buf.h"
...@@ -44,8 +45,6 @@ ...@@ -44,8 +45,6 @@
#include "pdb/procedural_db.h" #include "pdb/procedural_db.h"
#include "libgimp/gimphelpui.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@