move man pages out

ChangeLog

@@ -1,5 +1,7 @@
 29/8/07 started 7.13.0
 - we now have a trunk and the version is 7.13.x, woo!
+- move manpages into a separate man/ dir ... speeds up builds a lot on windows
+- don't install malkovich
 
 1/8/07 started 7.12.5
 - im_embed() is more general ... x and y can be negative

Makefile.am

@@ -13,6 +13,7 @@ SUBDIRS = \
 	include \
 	libsrcCC \
 	contrib \
+	man \
 	po \
 	$(P_COMPILE_DIR) 
 

TODO

@@ -1,9 +1,8 @@
-- can we use GraphicsMagick instead of ImageMagick?
-
 - when we fork for 7.13 do this stuff ... don't do now, we'll break the other
   packages
 
   http://www.freshports.org/graphics/vips
+  ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports
 
   freebsd packaging now does:
 
@@ -47,6 +46,11 @@ Python binding
 WONTFIX
 =======
 
+- can we use GraphicsMagick instead of ImageMagick?
+
+  no: current stable GraphicsMagick is missing (at least) QuantumRange and
+  GetNextImageAttribute() ... perhaps this will be fixed in 1.2
+
 - TIFF load/save should use meta system for unknown tags
 
 - balance should use new meta stuff

configure.in

@@ -99,7 +99,9 @@ GETTEXT_PACKAGE=vips7
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
         [The prefix for our gettext translation domains.])
-ALL_LINGUAS="en_GB malkovich"
+# the 'malkovich' one is there for testing only
+# ALL_LINGUAS="en_GB malkovich"
+ALL_LINGUAS="en_GB"
 AC_PROG_INTLTOOL
 AM_GLIB_GNU_GETTEXT
 
@@ -168,7 +170,7 @@ if test "x$with_fftw3" != "xno"; then
     [AC_MSG_WARN([fftw3 not found; disabling fftw support])])
 fi
 
-# ImageMagic ... detect attribute iteration too
+# ImageMagick ... detect attribute iteration too
 AC_ARG_WITH([magick], AS_HELP_STRING([--without-magick], [build without libMagic (default: test)]))
 
 if test "x$with_magick" != "xno"; then
@@ -184,7 +186,7 @@ if test "x$with_magick" != "xno"; then
   save_LIBS=$LIBS
   LIBS="$LIBS $MAGICK_LIBS"
   AC_CHECK_FUNCS(GetNextImageAttribute,
-    AC_DEFINE(HAVE_MAGICK_ATTR,1,[define if your imagemagick has attribute support.]))
+    AC_DEFINE(HAVE_MAGICK_ATTR,1,[define if your magick has attribute support.]))
   LIBS=$save_LIBS
 fi
 
@@ -337,22 +339,6 @@ AC_OUTPUT([
 	libsrc/other/Makefile 
 	libsrc/relational/Makefile 
 	libsrc/video/Makefile 
-	libsrc/acquire/man3/Makefile 
-	libsrc/arithmetic/man3/Makefile 
-	libsrc/boolean/man3/Makefile 
-	libsrc/colour/man3/Makefile 
-	libsrc/conversion/man3/Makefile 
-	libsrc/convolution/man3/Makefile 
-	libsrc/freq_filt/man3/Makefile 
-	libsrc/histograms_lut/man3/Makefile 
-	libsrc/inplace/man3/Makefile 
-	libsrc/iofuncs/man3/Makefile 
-	libsrc/matrix/man3/Makefile 
-	libsrc/morphology/man3/Makefile 
-	libsrc/mosaicing/man3/Makefile 
-	libsrc/other/man3/Makefile 
-	libsrc/relational/man3/Makefile 
-	libsrc/video/man3/Makefile 
 	libsrcCC/Makefile 
 	src/Makefile 
 	src/iofuncs/Makefile 
@@ -364,9 +350,7 @@ AC_OUTPUT([
 	src/scripts/batch_rubber_sheet 
 	src/scripts/light_correct 
 	src/scripts/shrink_width 
-	src/iofuncs/man1/Makefile 
-	src/other/man1/Makefile 
-	src/scripts/man1/Makefile 
+	man/Makefile 
 	contrib/Makefile 
 	contrib/vips2dj/Makefile 
 	contrib/vips2dj/share/Makefile 

libsrc/acquire/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libacquire.la
 
 libacquire_la_SOURCES = \

libsrc/acquire/man3/Makefile.am

@@ -1 +0,0 @@
-man_MANS = 

libsrc/arithmetic/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3 
-
 noinst_LTLIBRARIES = libarithmetic.la
 
 libarithmetic_la_SOURCES = \

libsrc/arithmetic/man3/Makefile.am

@@ -1,48 +0,0 @@
-man_MANS = \
-	im_abs.3 \
-	im_acostra.3 \
-	im_bandmean.3 \
-	im_sign.3 \
-	im_ceil.3 \
-	im_floor.3 \
-	im_add.3 \
-	im_asintra.3 \
-	im_atantra.3 \
-	im_avg.3 \
-	im_cmulnorm.3 \
-	im_costra.3 \
-	im_deviate.3 \
-	im_divide.3 \
-	im_exp10tra.3 \
-	im_expntra.3 \
-	im_exptra.3 \
-	im_fav4.3 \
-	im_gadd.3 \
-	im_gaddim.3 \
-	im_gfadd.3 \
-	im_invert.3 \
-	im_lintra.3 \
-	im_lintra_vec.3 \
-	im_litecor.3 \
-	im_log10tra.3 \
-	im_logtra.3 \
-	im_max.3 \
-	im_maxpos.3 \
-	im_maxpos_vec.3 \
-	im_measure.3 \
-	im_min.3 \
-	im_minpos.3 \
-	im_minpos_vec.3 \
-	im_multiply.3 \
-	im_powtra.3 \
-	im_sintra.3 \
-	im_rint.3 \
-	im_stats.3 \
-	im_remainder.3 \
-	im_remainderconst.3 \
-	im_subtract.3 \
-	im_tantra.3 \
-	im_expntra_vec.3 \
-	im_powtra_vec.3
-
-EXTRA_DIST = ${man_MANS}

libsrc/boolean/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libboolean.la
 
 libboolean_la_SOURCES = \

libsrc/boolean/man3/Makefile.am

@@ -1,16 +0,0 @@
-man_MANS = \
-	im_andimage.3 \
-	im_andconst.3 \
-	im_eorimage.3 \
-	im_eorconst.3 \
-	im_orimage.3 \
-	im_orconst.3 \
-	im_shiftleft.3 \
-	im_shiftright.3 \
-	im_eor_vec.3 \
-	im_or_vec.3 \
-	im_and_vec.3
-
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/colour/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libcolour.la
 
 libcolour_la_SOURCES = \

libsrc/colour/man3/Makefile.am

@@ -1,63 +0,0 @@
-man_MANS = \
-	im_LCh2Lab.3 \
-	im_LCh2UCS.3 \
-	im_Lab2LCh.3 \
-	im_Lab2LabQ.3 \
-	im_Lab2LabS.3 \
-	im_Lab2UCS.3 \
-	im_Lab2XYZ.3 \
-	im_XYZ2Yxy.3 \
-	im_Yxy2XYZ.3 \
-	im_Lab2disp.3 \
-	im_LabQ2Lab.3 \
-	im_LabQ2LabS.3 \
-	im_LabQ2XYZ.3 \
-	im_LabQ2disp.3 \
-	im_LabQ2disp_build_table.3 \
-	im_LabQ2disp_table.3 \
-	im_LabS2LabQ.3 \
-	im_LabS2Lab.3 \
-	im_UCS2LCh.3 \
-	im_UCS2Lab.3 \
-	im_UCS2XYZ.3 \
-	im_XYZ2Lab.3 \
-	im_XYZ2UCS.3 \
-	im_XYZ2disp.3 \
-	im_col_C2Cucs.3 \
-	im_col_Ch2ab.3 \
-	im_col_Ch2hucs.3 \
-	im_col_Chucs2h.3 \
-	im_col_Cucs2C.3 \
-	im_col_L2Lucs.3 \
-	im_col_Lab2XYZ.3 \
-	im_col_Lucs2L.3 \
-	im_col_XYZ2Lab.3 \
-	im_col_XYZ2rgb.3 \
-	im_col_ab2Ch.3 \
-	im_col_dECMC.3 \
-	im_col_display.3 \
-	im_col_make_tables_RGB.3 \
-	im_col_make_tables_UCS.3 \
-	im_col_pythagoras.3 \
-	im_col_rgb2XYZ.3 \
-	im_lab_morph.3 \
-	im_dE_fromLab.3 \
-	im_dE00_fromLab.3 \
-	im_dECMC_fromLab.3 \
-	im_dECMC_fromdisp.3 \
-	im_dE_fromXYZ.3 \
-	im_dE_fromdisp.3 \
-	im_disp2Lab.3 \
-	im_disp2XYZ.3 \
-	im_XYZ2sRGB.3 \
-	im_icc_present.3 \
-	im_icc_transform.3 \
-	im_icc_import.3 \
-	im_icc_import_embedded.3 \
-	im_icc_export.3 \
-	im_icc_export_depth.3 \
-	im_icc_ac2rc.3 \
-	im_sRGB2XYZ.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/conversion/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libconversion.la
 
 libconversion_la_SOURCES = \

libsrc/conversion/man3/Makefile.am

@@ -1,84 +0,0 @@
-man_MANS = \
-	im_analyze2vips.3 \
-	im_bandjoin.3 \
-	im_black.3 \
-	im_c2amph.3 \
-	im_c2imag.3 \
-	im_c2ps.3 \
-	im_c2real.3 \
-	im_c2rect.3 \
-	im_clip.3 \
-	im_clip2c.3 \
-	im_clip2cm.3 \
-	im_clip2d.3 \
-	im_clip2dcm.3 \
-	im_clip2f.3 \
-	im_clip2fmt.3 \
-	im_clip2i.3 \
-	im_clip2s.3 \
-	im_clip2ui.3 \
-	im_clip2us.3 \
-	im_copy.3 \
-	im_copy_set.3 \
-	im_copy_set_meta.3 \
-	im_copy_swap.3 \
-	im_copy_morph.3 \
-	im_copy_from.3 \
-	im_csv2vips.3 \
-	im_csv2vips_header.3 \
-	im_magick2vips.3 \
-	im_magick2vips_header.3 \
-	im_extract.3 \
-	im_extract_area.3 \
-	im_extract_areabands.3 \
-	im_extract_bands.3 \
-	im_falsecolour.3 \
-	im_fliphor.3 \
-	im_flipver.3 \
-	im_gbandjoin.3 \
-	im_insert.3 \
-	im_istiff.3 \
-	im_jpeg2vips.3 \
-	im_jpeg2vips_header.3 \
-	im_lrjoin.3 \
-	im_mask2vips.3 \
-	im_png2vips.3 \
-	im_png2vips_header.3 \
-	im_exr2vips.3 \
-	im_exr2vips_header.3 \
-	im_ppm2vips.3 \
-	im_ppm2vips_header.3 \
-	im_print.3 \
-	im_raw2vips.3 \
-	im_recomb.3 \
-	im_replicate.3 \
-	im_grid.3 \
-	im_ri2c.3 \
-	im_rot180.3 \
-	im_rot270.3 \
-	im_rot90.3 \
-	im_scale.3 \
-	im_scaleps.3 \
-	im_rightshift_size.3 \
-	im_slice.3 \
-	im_subsample.3 \
-	im_system.3 \
-	im_tbjoin.3 \
-	im_thresh.3 \
-	im_text.3 \
-	im_tiff2vips.3 \
-	im_tiff2vips_header.3 \
-	im_tile_cache.3 \
-	im_vips2bufjpeg.3 \
-	im_vips2csv.3 \
-	im_vips2jpeg.3 \
-	im_vips2mask.3 \
-	im_vips2mimejpeg.3 \
-	im_vips2png.3 \
-	im_vips2ppm.3 \
-	im_vips2tiff.3 \
-	im_zoom.3 \
-	im_msb.3 \
-	im_msb_band.3
-
-EXTRA_DIST = ${man_MANS}

libsrc/convolution/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libconvolution.la
 
 libconvolution_la_SOURCES = \

libsrc/convolution/man3/Makefile.am

@@ -1,58 +0,0 @@
-man_MANS = \
-	im_addgnoise.3 \
-	im_compass.3 \
-	im_conv.3 \
-	im_conv_raw.3 \
-	im_convf.3 \
-	im_convf_raw.3 \
-	im_convsep.3 \
-	im_convsep_raw.3 \
-	im_convsepf.3 \
-	im_convsepf_raw.3 \
-	im_convsub.3 \
-	im_contrast_surface.3 \
-	im_contrast_surface_raw.3 \
-	im_create_dmask.3 \
-	im_create_imask.3 \
-	im_dup_dmask.3 \
-	im_dup_imask.3 \
-	im_embed.3 \
-	im_fastcor.3 \
-	im_free_dmask.3 \
-	im_free_imask.3 \
-	im_gauss_dmask.3 \
-	im_gauss_imask.3 \
-	im_gaussnoise.3 \
-	im_gradient.3 \
-	im_lindetect.3 \
-	im_log_dmask.3 \
-	im_log_imask.3 \
-	im_lowpass.3 \
-	im_maxvalue.3 \
-	im_mpercent.3 \
-	im_offsets45.3 \
-	im_offsets90.3 \
-	im_print_dmask.3 \
-	im_print_imask.3 \
-	im_rank.3 \
-	im_rank_image.3 \
-	im_read_dmask.3 \
-	im_norm_dmask.3 \
-	im_read_imask.3 \
-	im_rotate_dmask45.3 \
-	im_rotate_dmask90.3 \
-	im_rotate_imask45.3 \
-	im_rotate_imask90.3 \
-	im_scale_dmask.3 \
-	im_sharpen.3 \
-	im_shrink.3 \
-	im_spcor.3 \
-	im_stretch3.3 \
-	im_write_dmask.3 \
-	im_write_dmask_name.3 \
-	im_write_imask.3 \
-	im_write_imask_name.3 \
-	im_zerox.3 
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/freq_filt/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libfreq_filt.la
 
 libfreq_filt_la_SOURCES = \

libsrc/freq_filt/man3/Makefile.am

@@ -1,13 +0,0 @@
-man_MANS = \
-	im_create_fmask.3 \
-	im_disp_ps.3 \
-	im_flt_imag_freq.3 \
-	im_fractsurf.3 \
-	im_freqflt.3 \
-	im_fwfft.3 \
-	im_invfft.3 \
-	im_invfftr.3 \
-	im_rotquad.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/histograms_lut/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libhistograms_lut.la
 
 libhistograms_lut_la_SOURCES = \

libsrc/histograms_lut/man3/Makefile.am

@@ -1,27 +0,0 @@
-man_MANS = \
-	im_gammacorrect.3 \
-	im_heq.3 \
-	im_hist.3 \
-	im_histeq.3 \
-	im_histcum.3 \
-	im_histnorm.3 \
-	im_histgr.3 \
-	im_histnD.3 \
-	im_histplot.3 \
-	im_histspec.3 \
-	im_hsp.3 \
-	im_identity.3 \
-	im_identity_ushort.3 \
-	im_invertlut.3 \
-	im_buildlut.3 \
-	im_lhisteq.3 \
-	im_lhisteq_raw.3 \
-	im_maplut.3 \
-	im_project.3 \
-	im_stdif.3 \
-	im_tone_analyse.3 \
-	im_tone_build.3 \
-	im_tone_map.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/inplace/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libinplace.la
 
 libinplace_la_SOURCES = \

libsrc/inplace/man3/Makefile.am

@@ -1,18 +0,0 @@
-man_MANS = \
-	im_circle.3 \
-	im_fastline.3 \
-	im_fastlineuser.3 \
-	im_flood.3 \
-	im_flood_blob.3 \
-	im_insertplace.3 \
-	im_line.3 \
-	im_lineset.3 \
-	im_paintrect.3 \
-	im_plotmask.3 \
-	im_plotpoint.3 \
-	im_readpoint.3 \
-	im_smear.3 \
-	im_smudge.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/iofuncs/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libiofuncs.la
 
 libiofuncs_la_SOURCES = \

libsrc/iofuncs/man3/Makefile.am

@@ -1,165 +0,0 @@
-man_MANS = \
-	IM_ARRAY.3 \
-	IM_IMAGE_ADDR.3 \
-	IM_IMAGE_N_ELEMENTS.3 \
-	IM_IMAGE_SIZEOF_ELEMENT.3 \
-	IM_IMAGE_SIZEOF_LINE.3 \
-	IM_IMAGE_SIZEOF_PEL.3 \
-	IM_MAX.3 \
-	IM_MIN.3 \
-	IM_NEW.3 \
-	IM_NUMBER.3 \
-	IM_REGION_ADDR.3 \
-	IM_REGION_LSKIP.3 \
-	IM_REGION_N_ELEMENTS.3 \
-	IM_REGION_SIZEOF_LINE.3 \
-	IM_RINT.3 \
-	IM_RECT_RIGHT.3 \
-	IM_RECT_BOTTOM.3 \
-	IM_RECT_HCENTRE.3 \
-	IM_RECT_VCENTRE.3 \
-	error_exit.3 \
-	im_BandFmt2char.3 \
-	im_Coding2char.3 \
-	im_Compression2char.3 \
-	im_Type2char.3 \
-	im_add_close_callback.3 \
-	im_add_eval_callback.3 \
-	im_add_evalend_callback.3 \
-	im_allocate_input_array.3 \
-	im_amiMSBfirst.3 \
-	im_binfile.3 \
-	im_bits_of_fmt.3 \
-	im_char2BandFmt.3 \
-	im_char2Coding.3 \
-	im_char2Compression.3 \
-	im_char2Type.3 \
-	im_concurrency_set.3 \
-	im_concurrency_get.3 \
-	im_error_buffer.3 \
-	im_verror.3 \
-	im_error_clear.3 \
-	im_close.3 \
-	im_cp_desc.3 \
-	im_cp_descv.3 \
-	im_cp_desc_array.3 \
-	im_debugim.3 \
-	im_demand_hint.3 \
-	im_demand_hint_array.3 \
-	im_diag.3 \
-	im_error.3 \
-	im_generate.3 \
-	im_guess_prefix.3 \
-	im_header.3 \
-	im_header_double.3 \
-	im_header_int.3 \
-	im_header_string.3 \
-	im_header_get.3 \
-	im_header_get_type.3 \
-	im_header_map.3 \
-	im_histlin.3 \
-	im_history_get.3 \
-	im_image.3 \
-	im_image_sanity.3 \
-	im_incheck.3 \
-	im_init.3 \
-	im_init_world.3 \
-	im_get_option_group.3 \
-	im_initdesc.3 \
-	im_iocheck.3 \
-	im_isMSBfirst.3 \
-	im_iscomplex.3 \
-	im_isfile.3 \
-	im_isfloat.3 \
-	im_isint.3 \
-	im_isscalar.3 \
-	im_isjpeg.3 \
-	im_ispartial.3 \
-	im_ispng.3 \
-	im_isppm.3 \
-	im_istifftiled.3 \
-	im_isuint.3 \
-	im_isvips.3 \
-	im_iterate.3 \
-	im_list_add.3 \
-	im_list_append.3 \
-	im_list_eq.3 \
-	im_list_fix.3 \
-	im_list_fold.3 \
-	im_list_free.3 \
-	im_list_index.3 \
-	im_list_insert.3 \
-	im_list_len.3 \
-	im_list_map.3 \
-	im_render.3 \
-	im_render_fade.3 \
-	im_cache.3 \
-	im_list_map_rev.3 \
-	im_list_member.3 \
-	im_list_pos.3 \
-	im_list_remove.3 \
-	im_makerw.3 \
-	im_malloc.3 \
-	im_free.3 \
-	im_mmapin.3 \
-	im_mmapinrw.3 \
-	im_open.3 \
-	im_open_local.3 \
-	im_open_local_array.3 \
-	im_openout.3 \
-	im_outcheck.3 \
-	im_partial.3 \
-	im_pincheck.3 \
-	im_piocheck.3 \
-	im_poutcheck.3 \
-	im_prepare.3 \
-	im_prepare_many.3 \
-	im_prepare_to.3 \
-	im_printdesc.3 \
-	im_printlines.3 \
-	im_rect_dup.3 \
-	im_rect_equalsrect.3 \
-	im_rect_includespoint.3 \
-	im_rect_includesrect.3 \
-	im_rect_intersectrect.3 \
-	im_rect_isempty.3 \
-	im_rect_marginadjust.3 \
-	im_rect_normalise.3 \
-	im_rect_unionrect.3 \
-	im_region_create.3 \
-	im_region_free.3 \
-	im_region_image.3 \
-	im_region_buffer.3 \
-	im_region_position.3 \
-	im_region_region.3 \
-	im_setbuf.3 \
-	im_setupout.3 \
-	im_start_many.3 \
-	im_start_one.3 \
-	im_stop_many.3 \
-	im_stop_one.3 \
-	im_updatehist.3 \
-	im_version.3 \
-	im_version_string.3 \
-	im_warn.3 \
-	im_wrapmany.3 \
-	im_wrapone.3 \
-	im_writeline.3 \
-	im_meta.3 \
-	im_meta_get.3 \
-	im_meta_get_area.3 \
-	im_meta_get_double.3 \
-	im_meta_get_int.3 \
-	im_meta_get_string.3 \
-	im_meta_get_type.3 \
-	im_meta_get_blob.3 \
-	im_meta_set.3 \
-	im_meta_set_area.3 \
-	im_meta_set_double.3 \
-	im_meta_set_int.3 \
-	im_meta_set_blob.3 \
-	im_meta_set_string.3 \
-	im_invalidate.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/matrix/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libmatrix.la
 
 libmatrix_la_SOURCES = \

libsrc/matrix/man3/Makefile.am

@@ -1,11 +0,0 @@
-man_MANS = \
-im_lu_decomp.3 \
-im_lu_solve.3 \
-im_matcat.3 \
-im_matinv.3 \
-im_matinv_inplace.3 \
-im_matmul.3 \
-im_mattrn.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/morphology/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libmorphology.la
 
 libmorphology_la_SOURCES = \

libsrc/morphology/man3/Makefile.am

@@ -1,9 +0,0 @@
-man_MANS = \
-	im_cntlines.3 \
-	im_dilate.3 \
-	im_dilate_raw.3 \
-	im_erode.3 \
-	im_erode_raw.3 \
-	im_profile.3
-
-EXTRA_DIST = ${man_MANS}

libsrc/mosaicing/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libmosaicing.la
 
 libmosaicing_la_SOURCES = \

libsrc/mosaicing/man3/Makefile.am

@@ -1,17 +0,0 @@
-man_MANS = \
-	im_affine.3 \
-	im_correl.3 \
-	im_global_balance.3 \
-	im_global_balance_float.3 \
-	im_lrmerge.3 \
-	im_lrmosaic.3 \
-	im_match_linear.3 \
-	im_match_linear_search.3 \
-	im_similarity.3 \
-	im_similarity_area.3 \
-	im_tbmerge.3 \
-	im_remosaic.3 \
-	im_tbmosaic.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/other/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libother.la
 
 libother_la_SOURCES = \

libsrc/other/man3/Makefile.am

@@ -1,30 +0,0 @@
-man_MANS = \
-	im_benchmark.3 \
-	im_cooc_asm.3 \
-	im_cooc_contrast.3 \
-	im_cooc_correlation.3 \
-	im_cooc_entropy.3 \
-	im_cooc_matrix.3 \
-	im_dif_std.3 \
-	im_eye.3 \
-	im_feye.3 \
-	im_fgrey.3 \
-	im_fzone.3 \
-	im_glds_asm.3 \
-	im_glds_contrast.3 \
-	im_glds_entropy.3 \
-	im_glds_matrix.3 \
-	im_glds_mean.3 \
-	im_grey.3 \
-	im_make_xy.3 \
-	im_mean_std_double_buffer.3 \
-	im_mean_std_int_buffer.3 \
-	im_sines.3 \
-	im_quantim.3 \
-	im_quantlut.3 \
-	im_simcontr.3 \
-	im_spatres.3 \
-	im_zone.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/relational/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = librelational.la
 
 librelational_la_SOURCES = \

libsrc/relational/man3/Makefile.am

@@ -1,24 +0,0 @@
-man_MANS = \
-	im_equal.3 \
-	im_equalconst.3 \
-	im_ifthenelse.3 \
-	im_less.3 \
-	im_lessconst.3 \
-	im_lesseq.3 \
-	im_lesseqconst.3 \
-	im_more.3 \
-	im_moreconst.3 \
-	im_moreeq.3 \
-	im_moreeqconst.3 \
-	im_blend.3 \
-	im_notequal.3 \
-	im_notequalconst.3 \
-	im_equal_vec.3 \
-	im_less_vec.3 \
-	im_lesseq_vec.3 \
-	im_more_vec.3 \
-	im_moreeq_vec.3 \
-	im_notequal_vec.3
-
-EXTRA_DIST = ${man_MANS}
-

libsrc/video/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = man3
-
 noinst_LTLIBRARIES = libvideo.la
 
 libvideo_la_SOURCES = \

libsrc/video/man3/Makefile.am

@@ -1,5 +0,0 @@
-man_MANS = \
-	im_video_v4l1.3
-
-EXTRA_DIST = ${man_MANS}
-

man/Makefile.am

@@ -0,0 +1,551 @@
+man_MANS = \
+	batch_crop.1 \
+	batch_image_convert.1 \
+	batch_rubber_sheet.1 \
+	binfile.1 \
+	cooc.1 \
+	cooc_features.1 \
+	debugim.1 \
+	edvips.1 \
+	glds.1 \
+	glds_features.1 \
+	header.1 \
+	light_correct.1 \
+	printlines.1 \
+	simcontr.1 \
+	sines.1 \
+	squares.1 \
+	vips.1 \
+	error_exit.3 \
+	im_abs.3 \
+	im_acostra.3 \
+	im_add.3 \
+	im_add_close_callback.3 \
+	im_add_eval_callback.3 \
+	im_add_evalend_callback.3 \
+	im_addgnoise.3 \
+	im_affine.3 \
+	im_allocate_input_array.3 \
+	im_amiMSBfirst.3 \
+	im_analyze2vips.3 \
+	im_andconst.3 \
+	im_andimage.3 \
+	im_and_vec.3 \
+	IM_ARRAY.3 \
+	im_asintra.3 \
+	im_atantra.3 \
+	im_avg.3 \
+	im_BandFmt2char.3 \
+	im_bandjoin.3 \
+	im_bandmean.3 \
+	im_benchmark.3 \
+	im_binfile.3 \
+	im_bits_of_fmt.3 \
+	im_black.3 \
+	im_blend.3 \
+	im_buildlut.3 \
+	im_c2amph.3 \
+	im_c2imag.3 \
+	im_c2ps.3 \
+	im_c2real.3 \
+	im_c2rect.3 \
+	im_cache.3 \
+	im_ceil.3 \
+	im_char2BandFmt.3 \
+	im_char2Coding.3 \
+	im_char2Compression.3 \
+	im_char2Type.3 \
+	im_circle.3 \
+	im_clip2c.3 \
+	im_clip2cm.3 \
+	im_clip2d.3 \
+	im_clip2dcm.3 \
+	im_clip2f.3 \
+	im_clip2fmt.3 \
+	im_clip2i.3 \
+	im_clip2s.3 \
+	im_clip2ui.3 \
+	im_clip2us.3 \
+	im_clip.3 \
+	im_close.3 \
+	im_cmulnorm.3 \
+	im_cntlines.3 \
+	im_Coding2char.3 \
+	im_col_ab2Ch.3 \
+	im_col_C2Cucs.3 \
+	im_col_Ch2ab.3 \
+	im_col_Ch2hucs.3 \
+	im_col_Chucs2h.3 \
+	im_col_Cucs2C.3 \
+	im_col_dECMC.3 \
+	im_col_display.3 \
+	im_col_L2Lucs.3 \
+	im_col_Lab2XYZ.3 \
+	im_col_Lucs2L.3 \
+	im_col_make_tables_RGB.3 \
+	im_col_make_tables_UCS.3 \
+	im_col_pythagoras.3 \
+	im_col_rgb2XYZ.3 \
+	im_col_XYZ2Lab.3 \
+	im_col_XYZ2rgb.3 \
+	im_compass.3 \
+	im_Compression2char.3 \
+	im_concurrency_get.3 \
+	im_concurrency_set.3 \
+	im_contrast_surface.3 \
+	im_contrast_surface_raw.3 \
+	im_conv.3 \
+	im_convf.3 \
+	im_convf_raw.3 \
+	im_conv_raw.3 \
+	im_convsep.3 \
+	im_convsepf.3 \
+	im_convsepf_raw.3 \
+	im_convsep_raw.3 \
+	im_convsub.3 \
+	im_cooc_asm.3 \
+	im_cooc_contrast.3 \
+	im_cooc_correlation.3 \
+	im_cooc_entropy.3 \
+	im_cooc_matrix.3 \
+	im_copy.3 \
+	im_copy_from.3 \
+	im_copy_morph.3 \
+	im_copy_set.3 \
+	im_copy_set_meta.3 \
+	im_copy_swap.3 \
+	im_correl.3 \
+	im_costra.3 \
+	im_cp_desc.3 \
+	im_cp_desc_array.3 \
+	im_cp_descv.3 \
+	im_create_dmask.3 \
+	im_create_fmask.3 \
+	im_create_imask.3 \
+	im_csv2vips.3 \
+	im_csv2vips_header.3 \
+	im_dE00_fromLab.3 \
+	im_debugim.3 \
+	im_dECMC_fromdisp.3 \
+	im_dECMC_fromLab.3 \
+	im_dE_fromdisp.3 \
+	im_dE_fromLab.3 \
+	im_dE_fromXYZ.3 \
+	im_demand_hint.3 \
+	im_demand_hint_array.3 \
+	im_deviate.3 \
+	im_diag.3 \
+	im_dif_std.3 \
+	im_dilate.3 \
+	im_dilate_raw.3 \
+	im_disp2Lab.3 \
+	im_disp2XYZ.3 \
+	im_disp_ps.3 \
+	im_divide.3 \
+	im_dup_dmask.3 \
+	im_dup_imask.3 \
+	im_embed.3 \
+	im_eorconst.3 \
+	im_eorimage.3 \
+	im_eor_vec.3 \
+	im_equal.3 \
+	im_equalconst.3 \
+	im_equal_vec.3 \
+	im_erode.3 \
+	im_erode_raw.3 \
+	im_error.3 \
+	im_error_buffer.3 \
+	im_error_clear.3 \
+	im_exp10tra.3 \
+	im_expntra.3 \
+	im_expntra_vec.3 \
+	im_exptra.3 \
+	im_exr2vips.3 \
+	im_exr2vips_header.3 \
+	im_extract.3 \
+	im_extract_area.3 \
+	im_extract_areabands.3 \
+	im_extract_bands.3 \
+	im_eye.3 \
+	im_falsecolour.3 \
+	im_fastcor.3 \
+	im_fastline.3 \
+	im_fastlineuser.3 \
+	im_fav4.3 \
+	im_feye.3 \
+	im_fgrey.3 \
+	im_fliphor.3 \
+	im_flipver.3 \
+	im_flood.3 \
+	im_flood_blob.3 \
+	im_floor.3 \
+	im_flt_imag_freq.3 \
+	im_fractsurf.3 \
+	im_free.3 \
+	im_free_dmask.3 \
+	im_free_imask.3 \
+	im_freqflt.3 \
+	im_fwfft.3 \
+	im_fzone.3 \
+	im_gadd.3 \
+	im_gaddim.3 \
+	im_gammacorrect.3 \
+	im_gauss_dmask.3 \
+	im_gauss_imask.3 \
+	im_gaussnoise.3 \
+	im_gbandjoin.3 \
+	im_generate.3 \
+	im_get_option_group.3 \
+	im_gfadd.3 \
+	im_glds_asm.3 \
+	im_glds_contrast.3 \
+	im_glds_entropy.3 \
+	im_glds_matrix.3 \
+	im_glds_mean.3 \
+	im_global_balance.3 \
+	im_global_balance_float.3 \
+	im_gradient.3 \
+	im_grey.3 \
+	im_grid.3 \
+	im_guess_prefix.3 \
+	im_header.3 \
+	im_header_double.3 \
+	im_header_get.3 \
+	im_header_get_type.3 \
+	im_header_int.3 \
+	im_header_map.3 \
+	im_header_string.3 \
+	im_heq.3 \
+	im_hist.3 \
+	im_histcum.3 \
+	im_histeq.3 \
+	im_histgr.3 \
+	im_histlin.3 \
+	im_histnD.3 \
+	im_histnorm.3 \
+	im_history_get.3 \
+	im_histplot.3 \
+	im_histspec.3 \
+	im_hsp.3 \
+	im_icc_ac2rc.3 \
+	im_icc_export.3 \
+	im_icc_export_depth.3 \
+	im_icc_import.3 \
+	im_icc_import_embedded.3 \
+	im_icc_present.3 \
+	im_icc_transform.3 \
+	im_identity.3 \
+	im_identity_ushort.3 \
+	im_ifthenelse.3 \
+	im_image.3 \
+	IM_IMAGE_ADDR.3 \
+	IM_IMAGE_N_ELEMENTS.3 \
+	im_image_sanity.3 \
+	IM_IMAGE_SIZEOF_ELEMENT.3 \
+	IM_IMAGE_SIZEOF_LINE.3 \
+	IM_IMAGE_SIZEOF_PEL.3 \
+	im_incheck.3 \
+	im_init.3 \
+	im_initdesc.3 \
+	im_init_world.3 \
+	im_insert.3 \
+	im_insertplace.3 \
+	im_invalidate.3 \
+	im_invert.3 \
+	im_invertlut.3 \
+	im_invfft.3 \
+	im_invfftr.3 \
+	im_iocheck.3 \
+	im_iscomplex.3 \
+	im_isfile.3 \
+	im_isfloat.3 \
+	im_isint.3 \
+	im_isjpeg.3 \
+	im_isMSBfirst.3 \
+	im_ispartial.3 \
+	im_ispng.3 \
+	im_isppm.3 \
+	im_isscalar.3 \
+	im_istiff.3 \
+	im_istifftiled.3 \
+	im_isuint.3 \
+	im_isvips.3 \
+	im_iterate.3 \
+	im_jpeg2vips.3 \
+	im_jpeg2vips_header.3 \
+	im_Lab2disp.3 \
+	im_Lab2LabQ.3 \
+	im_Lab2LabS.3 \
+	im_Lab2LCh.3 \
+	im_Lab2UCS.3 \
+	im_Lab2XYZ.3 \
+	im_lab_morph.3 \
+	im_LabQ2disp.3 \
+	im_LabQ2disp_build_table.3 \
+	im_LabQ2disp_table.3 \
+	im_LabQ2Lab.3 \
+	im_LabQ2LabS.3 \
+	im_LabQ2XYZ.3 \
+	im_LabS2Lab.3 \
+	im_LabS2LabQ.3 \
+	im_LCh2Lab.3 \
+	im_LCh2UCS.3 \
+	im_less.3 \
+	im_lessconst.3 \
+	im_lesseq.3 \
+	im_lesseqconst.3 \
+	im_lesseq_vec.3 \
+	im_less_vec.3 \
+	im_lhisteq.3 \
+	im_lhisteq_raw.3 \
+	im_lindetect.3 \
+	im_line.3 \
+	im_lineset.3 \
+	im_lintra.3 \
+	im_lintra_vec.3 \
+	im_list_add.3 \
+	im_list_append.3 \
+	im_list_eq.3 \
+	im_list_fix.3 \
+	im_list_fold.3 \
+	im_list_free.3 \
+	im_list_index.3 \
+	im_list_insert.3 \
+	im_list_len.3 \
+	im_list_map.3 \
+	im_list_map_rev.3 \
+	im_list_member.3 \
+	im_list_pos.3 \
+	im_list_remove.3 \
+	im_litecor.3 \
+	im_log10tra.3 \
+	im_log_dmask.3 \
+	im_log_imask.3 \
+	im_logtra.3 \
+	im_lowpass.3 \
+	im_lrjoin.3 \
+	im_lrmerge.3 \
+	im_lrmosaic.3 \
+	im_lu_decomp.3 \
+	im_lu_solve.3 \
+	im_magick2vips.3 \
+	im_magick2vips_header.3 \
+	im_makerw.3 \
+	im_make_xy.3 \
+	im_malloc.3 \
+	im_maplut.3 \
+	im_mask2vips.3 \
+	im_matcat.3 \
+	im_match_linear.3 \
+	im_match_linear_search.3 \
+	im_matinv.3 \
+	im_matinv_inplace.3 \
+	im_matmul.3 \
+	im_mattrn.3 \
+	im_max.3 \
+	IM_MAX.3 \
+	im_maxpos.3 \
+	im_maxpos_vec.3 \
+	im_maxvalue.3 \
+	im_mean_std_double_buffer.3 \
+	im_mean_std_int_buffer.3 \
+	im_measure.3 \
+	im_meta.3 \
+	im_meta_get.3 \
+	im_meta_get_area.3 \
+	im_meta_get_blob.3 \
+	im_meta_get_double.3 \
+	im_meta_get_int.3 \
+	im_meta_get_string.3 \
+	im_meta_get_type.3 \
+	im_meta_set.3 \
+	im_meta_set_area.3 \
+	im_meta_set_blob.3 \
+	im_meta_set_double.3 \
+	im_meta_set_int.3 \
+	im_meta_set_string.3 \
+	im_min.3 \
+	IM_MIN.3 \
+	im_minpos.3 \
+	im_minpos_vec.3 \
+	im_mmapin.3 \
+	im_mmapinrw.3 \
+	im_more.3 \
+	im_moreconst.3 \
+	im_moreeq.3 \
+	im_moreeqconst.3 \
+	im_moreeq_vec.3 \
+	im_more_vec.3 \
+	im_mpercent.3 \
+	im_msb.3 \
+	im_msb_band.3 \
+	im_multiply.3 \
+	IM_NEW.3 \
+	im_norm_dmask.3 \
+	im_notequal.3 \
+	im_notequalconst.3 \
+	im_notequal_vec.3 \
+	IM_NUMBER.3 \
+	im_offsets45.3 \
+	im_offsets90.3 \
+	im_open.3 \
+	im_open_local.3 \
+	im_open_local_array.3 \
+	im_openout.3 \
+	im_orconst.3 \
+	im_orimage.3 \
+	im_or_vec.3 \
+	im_outcheck.3 \
+	im_paintrect.3 \
+	im_partial.3 \
+	im_pincheck.3 \
+	im_piocheck.3 \
+	im_plotmask.3 \
+	im_plotpoint.3 \
+	im_png2vips.3 \
+	im_png2vips_header.3 \
+	im_poutcheck.3 \
+	im_powtra.3 \
+	im_powtra_vec.3 \
+	im_ppm2vips.3 \
+	im_ppm2vips_header.3 \
+	im_prepare.3 \
+	im_prepare_many.3 \
+	im_prepare_to.3 \
+	im_print.3 \
+	im_printdesc.3 \
+	im_print_dmask.3 \
+	im_print_imask.3 \
+	im_printlines.3 \
+	im_profile.3 \
+	im_project.3 \
+	im_quantim.3 \
+	im_quantlut.3 \
+	im_rank.3 \
+	im_rank_image.3 \
+	im_raw2vips.3 \
+	im_read_dmask.3 \
+	im_read_imask.3 \
+	im_readpoint.3 \
+	im_recomb.3 \
+	IM_RECT_BOTTOM.3 \
+	im_rect_dup.3 \
+	im_rect_equalsrect.3 \
+	IM_RECT_HCENTRE.3 \
+	im_rect_includespoint.3 \
+	im_rect_includesrect.3 \
+	im_rect_intersectrect.3 \
+	im_rect_isempty.3 \
+	im_rect_marginadjust.3 \
+	im_rect_normalise.3 \
+	IM_RECT_RIGHT.3 \
+	im_rect_unionrect.3 \
+	IM_RECT_VCENTRE.3 \
+	IM_REGION_ADDR.3 \
+	im_region_buffer.3 \
+	im_region_create.3 \
+	im_region_free.3 \
+	im_region_image.3 \
+	IM_REGION_LSKIP.3 \
+	IM_REGION_N_ELEMENTS.3 \
+	im_region_position.3 \
+	im_region_region.3 \
+	IM_REGION_SIZEOF_LINE.3 \
+	im_remainder.3 \
+	im_remainderconst.3 \
+	im_remainderconst_vec.3 \
+	im_remosaic.3 \
+	im_render.3 \
+	im_render_fade.3 \
+	im_replicate.3 \
+	im_ri2c.3 \
+	im_rightshift_size.3 \
+	im_rint.3 \
+	IM_RINT.3 \
+	im_rot180.3 \
+	im_rot270.3 \
+	im_rot90.3 \
+	im_rotate_dmask45.3 \
+	im_rotate_dmask90.3 \
+	im_rotate_imask45.3 \
+	im_rotate_imask90.3 \
+	im_rotquad.3 \
+	im_scale.3 \
+	im_scale_dmask.3 \
+	im_scaleps.3 \
+	im_setbuf.3 \
+	im_setupout.3 \
+	im_sharpen.3 \
+	im_shiftleft.3 \
+	im_shiftright.3 \
+	im_shrink.3 \
+	im_sign.3 \
+	im_simcontr.3 \
+	im_similarity.3 \
+	im_similarity_area.3 \
+	im_sines.3 \
+	im_sintra.3 \
+	im_slice.3 \
+	im_smear.3 \
+	im_smudge.3 \
+	im_spatres.3 \
+	im_spcor.3 \
+	im_sRGB2XYZ.3 \
+	im_start_many.3 \
+	im_start_one.3 \
+	im_stats.3 \
+	im_stdif.3 \
+	im_stop_many.3 \
+	im_stop_one.3 \
+	im_stretch3.3 \
+	im_subsample.3 \
+	im_subtract.3 \
+	im_system.3 \
+	im_tantra.3 \
+	im_tbjoin.3 \
+	im_tbmerge.3 \
+	im_tbmosaic.3 \
+	im_text.3 \
+	im_thresh.3 \
+	im_tiff2vips.3 \
+	im_tiff2vips_header.3 \
+	im_tile_cache.3 \
+	im_tone_analyse.3 \
+	im_tone_build.3 \
+	im_tone_map.3 \
+	im_Type2char.3 \
+	im_UCS2Lab.3 \
+	im_UCS2LCh.3 \
+	im_UCS2XYZ.3 \
+	im_updatehist.3 \
+	im_verror.3 \
+	im_version.3 \
+	im_version_string.3 \
+	im_video_v4l1.3 \
+	im_vips2bufjpeg.3 \
+	im_vips2csv.3 \
+	im_vips2jpeg.3 \
+	im_vips2mask.3 \
+	im_vips2mimejpeg.3 \
+	im_vips2png.3 \
+	im_vips2ppm.3 \
+	im_vips2tiff.3 \
+	im_warn.3 \
+	im_wrapmany.3 \
+	im_wrapone.3 \
+	im_write_dmask.3 \
+	im_write_dmask_name.3 \
+	im_write_imask.3 \
+	im_write_imask_name.3 \
+	im_writeline.3 \
+	im_XYZ2disp.3 \
+	im_XYZ2Lab.3 \
+	im_XYZ2sRGB.3 \
+	im_XYZ2UCS.3 \
+	im_XYZ2Yxy.3 \
+	im_Yxy2XYZ.3 \
+	im_zerox.3 \
+	im_zone.3 \
+	im_zoom.3
+
+EXTRA_DIST = ${man_MANS}