Commit bde4579f authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Add missing entry points.

2003-01-28  Tor Lillqvist  <tml@iki.fi>

	* libgimp/gimpui.def: Add missing entry points.

	* plug-ins/common/plugin-defs.pl: Mark bz2, mail, screenshot and
	url as optional (not built on Win32). Ditto for winclipboard and
	winprint (Win32 only).

	* plug-ins/common/mkgen.pl: Use -mwindows on Win32.

	* plug-ins/common/Makefile.am
	* plug-ins/common/.cvsignore: Regenerated.

	* configure.in: Correspondingly conditionally define BZ2, MAIL,
	SCREENSHOT, URL, WINCLIPBOARD and WINPRINT, and AC_SUBST them.
	Set XJT to empty always on Win32 (uses tar, mv and bzip2, which
	aren't usually available).
parent 9984145f
2003-01-28 Tor Lillqvist <tml@iki.fi>
* libgimp/gimpui.def: Add missing entry points.
* plug-ins/common/plugin-defs.pl: Mark bz2, mail, screenshot and
url as optional (not built on Win32). Ditto for winclipboard and
winprint (Win32 only).
* plug-ins/common/mkgen.pl: Use -mwindows on Win32.
* plug-ins/common/Makefile.am
* plug-ins/common/.cvsignore: Regenerated.
* configure.in: Correspondingly conditionally define BZ2, MAIL,
SCREENSHOT, URL, WINCLIPBOARD and WINPRINT, and AC_SUBST them.
Set XJT to empty always on Win32 (uses tar, mv and bzip2, which
aren't usually available).
2003-01-27 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/common/sample_colorize.c: code clean-up, added a few more
......
......@@ -209,7 +209,7 @@ if test x"$os_win32" = xyes; then
esac
if test x"$msnative_struct" = x ; then
AC_MSG_RESULT([no way])
AC_MSG_WARN([build will be incompatible with GLib and GTK+ DLLs])
AC_MSG_WARN([build will be incompatible with GTK+ DLLs])
else
CFLAGS="$CFLAGS $msnative_struct"
AC_MSG_RESULT([${msnative_struct}])
......@@ -697,7 +697,6 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
fi
AC_SUBST(JPEG)
AC_SUBST(XJT)
AC_SUBST(LIBJPEG)
......@@ -951,6 +950,31 @@ fi
AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno)
###########################################################
# Some plug-ins don't build on Win32, others are Win32-only
###########################################################
if test x"$os_win32" = xyes; then
WINCLIPBOARD='winclipboard'
WINPRINT='winprint'
dnl xjt does build, but it isn't more confusing than useful on Win32,
dnl as it wants to run tar, mv and bzip2, which seldom are available
XJT=''
else
BZ2='bz2'
MAIL='mail'
SCREENSHOT='screenshot'
URL='url'
fi
AC_SUBST(BZ2)
AC_SUBST(MAIL)
AC_SUBST(SCREENSHOT)
AC_SUBST(URL)
AC_SUBST(WINCLIPBOARD)
AC_SUBST(WINPRINT)
AC_SUBST(XJT)
#################################################################
# Determine where to install the GNOME2 desktop & mime info files
#################################################################
......
......@@ -5,6 +5,11 @@ EXPORTS
gimp_channel_menu_new
gimp_drawable_menu_new
gimp_export_image
gimp_fixme_preview_do_row
gimp_fixme_preview_fill
gimp_fixme_preview_fill_with_thumb
gimp_fixme_preview_free
gimp_fixme_preview_new
gimp_gradient_select_widget
gimp_gradient_select_widget_close_popup
gimp_gradient_select_widget_set_popup
......@@ -15,4 +20,5 @@ EXPORTS
gimp_pattern_select_widget
gimp_pattern_select_widget_close_popup
gimp_pattern_select_widget_set_popup
gimp_plug_in_parse_path
gimp_ui_init
......@@ -125,7 +125,9 @@ vpropagate
warp
waves
whirlpinch
winclipboard
wind
winprint
wmf
xbm
xpm
......
## This file is autogenerated by mkgen.pl and plugin-defs.pl
if OS_WIN32
mwindows = -mwindows
endif
AM_LDFLAGS = $(mwindows)
libexecdir = $(gimpplugindir)/plug-ins
EXTRA_DIST = \
mkgen.pl \
plugin-defs.pl \
winclipboard.c \
winprint.c
plugin-defs.pl
INCLUDES = \
-I$(top_srcdir) \
......@@ -30,7 +34,7 @@ libexec_PROGRAMS = \
blur \
borderaverage \
bumpmap \
bz2 \
$(BZ2) \
c_astretch \
checkerboard \
color_enhance \
......@@ -80,7 +84,7 @@ libexec_PROGRAMS = \
$(JPEG) \
laplace \
lic \
mail \
$(MAIL) \
mapcolor \
max_rgb \
mblur \
......@@ -109,7 +113,7 @@ libexec_PROGRAMS = \
rotate \
sample_colorize \
scatter_hsv \
screenshot \
$(SCREENSHOT) \
sel_gauss \
semiflatten \
sharpen \
......@@ -131,14 +135,16 @@ libexec_PROGRAMS = \
tiler \
uniteditor \
unsharp \
url \
$(URL) \
video \
vinvert \
vpropagate \
warp \
waves \
whirlpinch \
$(WINCLIPBOARD) \
wind \
$(WINPRINT) \
wmf \
xbm \
$(XPM) \
......@@ -147,10 +153,16 @@ libexec_PROGRAMS = \
EXTRA_PROGRAMS = \
aa \
bz2 \
jpeg \
mail \
png \
psp \
screenshot \
tiff \
url \
winclipboard \
winprint \
xpm
install-%: %
......@@ -343,6 +355,7 @@ bz2_LDADD = \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(LIBBZ2) \
$(GLIB_LIBS) \
$(INTLLIBS)
......@@ -936,6 +949,7 @@ mail_LDADD = \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(LIBMAIL) \
$(GTK_LIBS) \
$(INTLLIBS)
......@@ -1278,6 +1292,7 @@ screenshot_LDADD = \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(LIBSCREENSHOT) \
$(GTK_LIBS) \
$(INTLLIBS)
......@@ -1537,6 +1552,7 @@ url_LDADD = \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(LIBURL) \
$(GLIB_LIBS) \
$(INTLLIBS)
......@@ -1610,6 +1626,19 @@ whirlpinch_LDADD = \
$(GTK_LIBS) \
$(INTLLIBS)
winclipboard_SOURCES = \
winclipboard.c
winclipboard_LDADD = \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(LIBWINCLIPBOARD) \
$(GLIB_LIBS) \
$(INTLLIBS)
wind_SOURCES = \
wind.c
......@@ -1622,6 +1651,19 @@ wind_LDADD = \
$(GTK_LIBS) \
$(INTLLIBS)
winprint_SOURCES = \
winprint.c
winprint_LDADD = \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(LIBWINPRINT) \
$(GLIB_LIBS) \
$(INTLLIBS)
wmf_SOURCES = \
wmf.c
......
......@@ -40,6 +40,12 @@ foreach ($bins, $opts) { s/ \\\n$//s }
print MK <<EOT;
## This file is autogenerated by mkgen.pl and plugin-defs.pl
if OS_WIN32
mwindows = -mwindows
endif
AM_LDFLAGS = \$(mwindows)
libexecdir = \$(gimpplugindir)/plug-ins
EXTRA_DIST = \\
......
......@@ -14,7 +14,7 @@
'blur' => { libdep => 'gtk', ui => 1 },
'borderaverage' => { libdep => 'gtk', ui => 1 },
'bumpmap' => { libdep => 'gtk', ui => 1 },
'bz2' => { libdep => 'glib' },
'bz2' => { libdep => 'glib', optional => 1 },
'c_astretch' => { libdep => 'glib' },
'checkerboard' => { libdep => 'gtk', ui => 1 },
'color_enhance' => { libdep => 'gtk', ui => 1 },
......@@ -64,7 +64,7 @@
'jpeg' => { libdep => 'gtk', ui => 1, optional => 1 },
'laplace' => { libdep => 'glib', ui => 1 },
'lic' => { libdep => 'gtk', ui => 1 },
'mail' => { libdep => 'gtk', ui => 1 },
'mail' => { libdep => 'gtk', ui => 1, optional => 1 },
'mapcolor' => { libdep => 'gtk', ui => 1 },
'max_rgb' => { libdep => 'gtk', ui => 1 },
'mblur' => { libdep => 'gtk', ui => 1 },
......@@ -93,7 +93,7 @@
'rotate' => { libdep => 'glib' },
'sample_colorize' => { libdep => 'gtk', ui => 1 },
'scatter_hsv' => { libdep => 'gtk', ui => 1 },
'screenshot' => { libdep => 'gtk', ui => 1 },
'screenshot' => { libdep => 'gtk', ui => 1, optional => 1 },
'sel_gauss' => { libdep => 'gtk', ui => 1 },
'semiflatten' => { libdep => 'glib' },
'sharpen' => { libdep => 'gtk', ui => 1 },
......@@ -115,22 +115,19 @@
'tiler' => { libdep => 'glib' },
'uniteditor' => { libdep => 'gtk', ui => 1 },
'unsharp' => { libdep => 'gtk', ui => 1 },
'url' => { libdep => 'glib' },
'url' => { libdep => 'glib', optional => 1 },
'video' => { libdep => 'gtk', ui => 1 },
'vinvert' => { libdep => 'glib' },
'vpropagate' => { libdep => 'gtk', ui => 1 },
'warp' => { libdep => 'gtk', ui => 1 },
'waves' => { libdep => 'gtk', ui => 1 },
'whirlpinch' => { libdep => 'gtk', ui => 1 },
'winclipboard' => { libdep => 'glib', ui => 1, optional => 1 },
'wind' => { libdep => 'gtk', ui => 1 },
'winprint' => { libdep => 'glib', ui => 1, optional => 1 },
'wmf' => { libdep => 'gtk', ui => 1 },
'xbm' => { libdep => 'gtk', ui => 1 },
'xpm' => { libdep => 'gtk', ui => 1, optional => 1 },
'xwd' => { libdep => 'gtk', ui => 1 },
'zealouscrop' => { libdep => 'glib' }
);
@extra = qw(
winclipboard.c
winprint.c
);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment