Merge branch 'master' of ssh://github.com/ellson/graphviz

Conflicts:
	lib/edgepaint/Makefile.am

diff --cc lib/edgepaint/Makefile.am
index 24700a339b068b25f0adb76985fac6313406156e,58890b45647485e417dff2d9bf44a4696706fc90..75b703347de1c951f0c722be0f87d13263dbe0fd
--- 1/lib/edgepaint/Makefile.am
--- 2/lib/edgepaint/Makefile.am
+++ b/lib/edgepaint/Makefile.am
@@@ -15,9 -20,17 +20,18 @@@ noinst_HEADERS =  edge_distinct_colorin
  
  noinst_LTLIBRARIES = libedgepaint_C.la
  lib_LTLIBRARIES = liblab_gamut.la
+ pkgconfig_DATA = liblab_gamut.pc
+ man_MANS = lab_gamut.3
+ pdf_DATA = lab_gamut.3.pdf
  
  libedgepaint_C_la_SOURCES = edge_distinct_coloring.c  furtherest_point.c  intersection.c  lab.c  node_distinct_coloring.c
+ 
+ liblab_gamut_la_LDFLAGS = -version-info $(LAB_GAMUT_VERSION)
  liblab_gamut_la_SOURCES = lab_gamut.c
  
- EXTRA_DIST = edgepaintlib.vcproj lab_gamut.vcproj
+ lab_gamut.3.pdf: $(srcdir)/lab_gamut.3
+       - @GROFF@ -Tps -man $(srcdir)/lab_gamut.3 | @PS2PDF@ - - >lab_gamut.3.pdf
+ 
 -EXTRA_DIST =  $(man_MANS) $(pdf_DATA) edgepaintlib.vcproj
++EXTRA_DIST =  $(man_MANS) $(pdf_DATA) edgepaintlib.vcproj lab_gamut.vcproj lab_gamut.def
   
++DISTCLEANFILES = $(pdf_DATA)