diff --git a/Makefile b/Makefile
index 1bfd15a..4f7fef2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1 @@
-# default Makefile to invoke Jam
-
-all::
-	jam -q -fJambase -j 3
-
-clean::
-	jam clean
-
-install::
-	jam -q -fJambase -j 3 install
+# Empty Makefile
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..f5797f2
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libargyll.la
+privatelibdir = $(pkglibdir)
+
+libargyll_la_SOURCES = xicc/xicc.c xicc/xicc.h xicc/xcam.c xicc/xcam.h	\
+	gamut/gamut.c gamut/gamut.h xicc/xfit.c xicc/xfit.h		\
+	xicc/cam97s3.c xicc/cam97s3.h xicc/cam02.c xicc/cam02.h		\
+	xicc/moncurve.c xicc/moncurve.h xicc/xspect.c xicc/xspect.h	\
+	xicc/xcal.c xicc/xcal.h xicc/xcolorants.h xicc/xcolorants.c
+libargyll_la_LIBADD = ./rspl/librspl.la $(ICC_LIBS)	\
+	./numlib/libargyllnum.la ./cgats/libcgats.la
+
+SUBDIRS = h doc ref numlib cgats plot rspl $(ICC_SUBDIRS) jcnf ucmm	\
+	render . gamut spectro xicc target link tweak profile scanin	\
+	imdi
+
+EXTRA_DIST = Readme.txt ttbd.txt log.txt
+
diff --git a/Makefile.shared b/Makefile.shared
new file mode 100644
index 0000000..9ea9670
--- /dev/null
+++ b/Makefile.shared
@@ -0,0 +1,15 @@
+# -*- mode: Makefile -*-
+
+# Common CFLAGS for Argyll components
+AM_CFLAGS = -DUNIX -I $(top_srcdir)/cgats -I$(top_srcdir)/gamut		\
+    -I$(top_srcdir)/h -I$(top_srcdir)/jcnf		\
+    -I$(top_srcdir)/numlib -I$(top_srcdir)/plot -I$(top_srcdir)/profile	\
+    -I$(top_srcdir)/render -I$(top_srcdir)/rspl -I$(top_srcdir)/spectro	\
+    -I$(top_srcdir)/target -I$(top_srcdir)/ucmm -I$(top_srcdir)/xicc	\
+    $(TIFF_CFLAGS) $(ICC_CFLAGS)
+
+# Build libs in other dirs when required
+../%.la:
+	$(MAKE) -C $(@D) $(@F)
+./%.la:
+	$(MAKE) -C $(@D) $(@F)
diff --git a/cgats/Makefile b/cgats/Makefile
index 5312104..4f7fef2 100644
--- a/cgats/Makefile
+++ b/cgats/Makefile
@@ -1,68 +1 @@
-# UNIX style makefile, for icclib and friends.
-# "include" the right environment for your system,
-# by uncommenting the appropriate line:
-
-# Microsoft C++, WinNT setup
-#include Makefile.WNT
-
-# IBM C++, WinNT setup
-include Makefile.IBMNT
-
-# Generic UNIX setup
-#include Makefile.UNIX
-
-# Apple OSX
-#include Makefile.OSX
-
-###############################
-
-#Compile with separate stndard malloc & file io
-#CCDEFINES = $(DEFFLAG)SEPARATE_STD
-
-#Set optimisation on
-CCFLAGS = $(CCFLAGSDEF) $(CCOPTFLAG) $(CCDEFINES)
-
-#Set debugging on
-#CCFLAGS = $(CCFLAGSDEF) $(CCDEBUGFLAG) $(CCDEFINES)
-
-STDHDRS = $(STDHDRSDEF)
-LINKFLAGS = $(LINKFLAGSDEF) $(LINKDEBUGFLAG)
-
-all:: libcgats$(SUFLIB) pars$(SUFEXE) cgats$(SUFEXE)
-
-
-# Separate for executables
-parsstd$(SUFOBJ): parsstd.c pars.h
-	$(CC) $(CCOF)parsstd$(SUFOBJ) parsstd.c
-
-cgatsstd$(SUFOBJ): cgatsstd.c cgats.h pars.h
-	$(CC) $(CCOF)cgatsstd$(SUFOBJ) cgatsstd.c
-
-
-pars$(SUFOBJ): pars.c pars.h
-	$(CC) $(CCOF)pars$(SUFOBJ) pars.c
-
-cgats$(SUFOBJ): cgats.c cgats.h pars.h
-	$(CC) $(CCOF)cgats$(SUFOBJ) cgats.c
-
-
-libcgats$(SUFLIB): pars$(SUFOBJ) cgats$(SUFOBJ)
-	$(LIBU) $(LIBOF)libcgats$(SUFLIB) cgats$(SUFOBJ) pars$(SUFOBJ)
-	$(RANLIB) libcgats$(SUFLIB)
-
-
-sa_pars$(SUFOBJ): pars.c pars.h
-	$(CC) $(CCOF)sa_pars$(SUFOBJ) $(DEFFLAG)STANDALONE_TEST pars.c
-
-pars$(SUFEXE): sa_pars$(SUFOBJ) parsstd$(SUFOBJ)
-	$(LINK) $(LINKOF)pars$(SUFEXE) sa_pars$(SUFOBJ) parsstd$(SUFOBJ) $(LINKLIBS)
-
-
-sa_cgats$(SUFOBJ): cgats.c cgats.h pars.h
-	$(CC) $(CCOF)sa_cgats$(SUFOBJ) $(DEFFLAG)STANDALONE_TEST cgats.c
-
-cgats$(SUFEXE): sa_cgats$(SUFOBJ) pars$(SUFOBJ) parsstd$(SUFOBJ) cgatsstd$(SUFOBJ)
-	$(LINK) $(LINKOF)cgats$(SUFEXE) sa_cgats$(SUFOBJ) pars$(SUFOBJ) parsstd$(SUFOBJ) \
-                                    cgatsstd$(SUFOBJ) $(LINKLIBS)
-
-
+# Empty Makefile
diff --git a/cgats/Makefile.am b/cgats/Makefile.am
new file mode 100644
index 0000000..d7cd4f0
--- /dev/null
+++ b/cgats/Makefile.am
@@ -0,0 +1,11 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libcgats.la
+privatelibdir = $(pkglibdir)
+
+libcgats_la_SOURCES = pars.c pars.h cgats.c cgats.h parsstd.c	\
+	cgatsstd.c
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..e944d3a
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,65 @@
+AC_INIT([argyll], [1.1.0])
+AM_INIT_AUTOMAKE([1.9 foreign])
+
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+
+AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
+
+AC_PATH_XTRA
+
+AC_CHECK_LIB(m, sqrt)
+AC_CHECK_LIB(pthread, pthread_create)
+
+AC_CHECK_LIB(tiff, TIFFOpen, TIFF_LIBS="-ltiff", , -lm)
+AC_SUBST([TIFF_LIBS])
+
+AC_CHECK_LIB(icc, new_icmFileStd_name, HAVE_ICC="true", , -lm)
+if test "$HAVE_ICC" = "true" ; then
+   ICC_LIBS="-licc"
+else
+   ICC_LIBS='$(top_srcdir)/icc/libicc.la'
+   ICC_CFLAGS='-I$(top_srcdir)/icc'
+   ICC_SUBDIRS='icc'
+fi
+AC_SUBST([ICC_LIBS])
+AC_SUBST([ICC_CFLAGS])
+AC_SUBST([ICC_SUBDIRS])
+
+AC_CHECK_LIB(X11, XOpenDisplay, X_LIBS="$X_LIBS -lX11")
+AC_CHECK_LIB(Xext, XextFindDisplay, X_LIBS="$X_LIBS -lXext",,-lX11)
+AC_CHECK_LIB(Xss, XScreenSaverSuspend, X_LIBS="$X_LIBS -lXss",,-lXext -lX11)
+AC_CHECK_LIB(Xrandr, XRRRootToScreen, X_LIBS="$X_LIBS -lXrandr",,-LXext -lX11)
+AC_CHECK_LIB(Xinerama, XineramaQueryScreens, X_LIBS="$X_LIBS -lXinerama",,-LXext -lX11)
+AC_CHECK_LIB(Xxf86vm, XF86VidModeGetGamma, X_LIBS="$X_LIBS -lXxf86vm",,-lXext -lX11)
+AC_SUBST([X_LIBS])
+
+AC_CHECK_LIB(usb, usb_open, USB_LIBS="-lusb", , -lusb)
+AC_SUBST([USB_LIBS])
+
+AC_CONFIG_FILES([Makefile
+                 h/Makefile
+                 doc/Makefile
+                 ref/Makefile
+                 numlib/Makefile
+                 cgats/Makefile
+		 plot/Makefile
+		 rspl/Makefile
+		 icc/Makefile
+		 gamut/Makefile
+		 xicc/Makefile
+		 link/Makefile
+		 spectro/Makefile
+		 profile/Makefile
+		 tweak/Makefile
+		 scanin/Makefile
+		 render/Makefile
+		 target/Makefile
+		 imdi/Makefile
+		 jcnf/Makefile
+		 jcnf/yajl/Makefile
+		 ucmm/Makefile])
+AC_OUTPUT
+
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..6527636
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,61 @@
+## Process this file with automake to produce Makefile.in
+
+docdir = $(datadir)/doc/argyll
+
+	doc_DATA = DocLicense.txt License.txt License2.txt License3.txt ArgyllDoc.html
+	ChangesSummary.html cal_format.html Compiling.html Installing.html
+	Installing_MSWindows.html Installing_OSX.html Installing_Linux.html
+	File_Formats.html MinorTools.html Organisation.html Overview.html
+	Limitations.html Performance.html Environment.html Scenarios.html FWA.html
+	FWA_measure.jpg instruments.html ArgyllFlow.jpg ArgyllFlowThumb.jpg
+	DTP20.jpg DTP22.jpg DTP41.jpg DTP51.jpg DTP92.jpg DTP94.jpg HCFR.jpg
+	Huey.jpg Spyd2.jpg Spyd3.jpg Spyd3x.jpg i1d.jpg i1m.jpg i1p.jpg sl.jpg
+	ss.jpg mox.jpg moxxr.jpg Chroma4.jpg ColorMunki.jpg ColorMunkiCreate.jpg
+	iccgamutmapping.html gamutmapping1.jpg monitorcontrols.html gamma.html
+	calvschar.html WideGamutColmters.html CrushedDisplyBlacks.html
+	i1proDriver.html i1proDriver.xls YellowGreen.jpg srgbplot.gif Source.html
+	average.html applycal.html cb2ti3.html cctiff.html cht_format.html
+	dispwin.html dispcal.html dispread.html dispprofloc.html extracticc.html
+	extractttag.html synthcal.html fakeCMY.html fakeread.html filmread.html
+	filmtarg.html greytiff.html iccdump.html iccgamut.html illumread.html
+	ccmxmake.html ccmxs.html ccmxs illumread_1.jpg illumread_2.jpg
+	illumread_3.jpg illumread_4.jpg illumread_5.jpg illumread_6.jpg
+	collink.html icclu.html kodak2ti3.html txt2ti3.html mppcheck.html
+	mpplu.html mppprof.html chartread.html printtarg.html profcheck.html
+	invprofcheck.html colprof.html printcal.html refine.html revfix.html
+	scanin.html sepgen.html splitti3.html spec2cie.html specplot.html
+	spotread.html synthread.html targen.html ti3_format.html tiffgamut.html
+	timage.html cube.jpg surface.jpg LabSteps.jpg verify.html viewgam.html
+	xicclu.html spyd2en.html ucmm.html Q60.jpg DC.jpg SG.jpg i1scan14.jpg
+	HCT.jpg CMP_DT_003.jpg CMP_Digital_Target-3.jpg colorchecker.jpg LSDC.jpg
+	Kgraph1.jpg Kgraph2.jpg Kgraph3.jpg Kgraph4.jpg Kgraph5.jpg Kgraph6.jpg
+	Kgraph7.jpg Kgraph8.jpg Kparams.jpg CRTspectrum.jpg Fluorescent.jpg
+
+EXTRA_DIST = DocLicense.txt License.txt License2.txt License3.txt ArgyllDoc.html
+	ChangesSummary.html cal_format.html Compiling.html Installing.html
+	Installing_MSWindows.html Installing_OSX.html Installing_Linux.html
+	File_Formats.html MinorTools.html Organisation.html Overview.html
+	Limitations.html Performance.html Environment.html Scenarios.html FWA.html
+	FWA_measure.jpg instruments.html ArgyllFlow.jpg ArgyllFlowThumb.jpg
+	DTP20.jpg DTP22.jpg DTP41.jpg DTP51.jpg DTP92.jpg DTP94.jpg HCFR.jpg
+	Huey.jpg Spyd2.jpg Spyd3.jpg Spyd3x.jpg i1d.jpg i1m.jpg i1p.jpg sl.jpg
+	ss.jpg mox.jpg moxxr.jpg Chroma4.jpg ColorMunki.jpg ColorMunkiCreate.jpg
+	iccgamutmapping.html gamutmapping1.jpg monitorcontrols.html gamma.html
+	calvschar.html WideGamutColmters.html CrushedDisplyBlacks.html
+	i1proDriver.html i1proDriver.xls YellowGreen.jpg srgbplot.gif Source.html
+	average.html applycal.html cb2ti3.html cctiff.html cht_format.html
+	dispwin.html dispcal.html dispread.html dispprofloc.html extracticc.html
+	extractttag.html synthcal.html fakeCMY.html fakeread.html filmread.html
+	filmtarg.html greytiff.html iccdump.html iccgamut.html illumread.html
+	ccmxmake.html ccmxs.html ccmxs illumread_1.jpg illumread_2.jpg
+	illumread_3.jpg illumread_4.jpg illumread_5.jpg illumread_6.jpg
+	collink.html icclu.html kodak2ti3.html txt2ti3.html mppcheck.html
+	mpplu.html mppprof.html chartread.html printtarg.html profcheck.html
+	invprofcheck.html colprof.html printcal.html refine.html revfix.html
+	scanin.html sepgen.html splitti3.html spec2cie.html specplot.html
+	spotread.html synthread.html targen.html ti3_format.html tiffgamut.html
+	timage.html cube.jpg surface.jpg LabSteps.jpg verify.html viewgam.html
+	xicclu.html spyd2en.html ucmm.html Q60.jpg DC.jpg SG.jpg i1scan14.jpg
+	HCT.jpg CMP_DT_003.jpg CMP_Digital_Target-3.jpg colorchecker.jpg LSDC.jpg
+	Kgraph1.jpg Kgraph2.jpg Kgraph3.jpg Kgraph4.jpg Kgraph5.jpg Kgraph6.jpg
+	Kgraph7.jpg Kgraph8.jpg Kparams.jpg CRTspectrum.jpg Fluorescent.jpg
diff --git a/gamut/Makefile.am b/gamut/Makefile.am
new file mode 100644
index 0000000..a12d2cb
--- /dev/null
+++ b/gamut/Makefile.am
@@ -0,0 +1,25 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libgamut.la libgammap.la
+privatelibdir = $(pkglibdir)
+
+libgamut_la_SOURCES = gamut.h gamut.c
+libgamut_la_LIBADD = ../cgats/libcgats.la $(ICC_LIBS)	\
+	../numlib/libargyllnum.la
+
+libgammap_la_SOURCES = gammap.h gammap.c nearsmth.c nearsmth.h
+libgammap_la_LIBADD = ./libgamut.la $(ICC_LIBS)			\
+	../numlib/libargyllnum.la ../plot/libvrml.la		\
+	../rspl/librspl.la ../libargyll.la ../cgats/libcgats.la
+
+LDADD = ./libgamut.la ./libgammap.la $(ICC_LIBS) ../cgats/libcgats.la	\
+	../rspl/librspl.la ../plot/libvrml.la ../xicc/libxicc.la	\
+	../spectro/libinsttypes.la ../numlib/libargyllnum.la
+
+bin_PROGRAMS = viewgam
+
+check_PROGRAMS = smthtest GenRMGam GenVisGam maptest surftest fakegam
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/h/Makefile.am b/h/Makefile.am
new file mode 100644
index 0000000..c62e776
--- /dev/null
+++ b/h/Makefile.am
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = Readme.txt copyright.h config.h sort.h llist.h xlist.h	\
+	counters.h
+
diff --git a/icc/Makefile b/icc/Makefile
index dbb9992..4f7fef2 100644
--- a/icc/Makefile
+++ b/icc/Makefile
@@ -1,82 +1 @@
-# UNIX style makefile, for icclib and friends.
-# "include" the right environment for your system,
-# by uncommenting the appropriate line:
-
-# Microsoft C++, WinNT setup
-include Makefile.WNT
-
-# IBM C++, WinNT setup
-#include Makefile.IBMNT
-
-# Generic UNIX setup
-#include Makefile.UNIX
-
-# Apple OSX
-#include Makefile.OSX
-
-###############################
-
-#Compile with separate stdio
-#CCDEFINES = $(DEFFLAG)SEPARATE_STD
-
-#Set optimisation on
-CCFLAGS = $(CCFLAGSDEF) $(CCOPTFLAG) $(CCDEFINES)
-
-#Set debugging on
-#CCFLAGS = $(CCFLAGSDEF) $(CCDEBUGFLAG) $(CCDEFINES)
-
-STDHDRS = $(STDHDRSDEF)
-LINKFLAGS = $(LINKFLAGSDEF) $(LINKDEBUGFLAG)
-
-all:: libicc$(SUFLIB) icctest$(SUFEXE) lutest$(SUFEXE) icclu$(SUFEXE) iccdump$(SUFEXE) iccrw$(SUFEXE)
-
-
-icc$(SUFOBJ): icc.c icc.h
-	$(CC) $(CCOF)icc$(SUFOBJ) icc.c
-
-libicc$(SUFLIB): icc$(SUFOBJ)
-	$(LIBU) $(LIBOF)libicc$(SUFLIB) icc$(SUFOBJ)
-	$(RANLIB) libicc$(SUFLIB)
-
-
-# Separate for executables
-iccstd$(SUFOBJ): iccstd.c icc.h
-	$(CC) $(CCOF)iccstd$(SUFOBJ) iccstd.c
-
-
-icctest$(SUFOBJ): icctest.c icc.h
-	$(CC) $(CCOF)icctest$(SUFOBJ) icctest.c
-
-icctest$(SUFEXE): icctest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-	$(LINK) $(LINKOF)icctest$(SUFEXE) icctest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-
-
-lutest$(SUFOBJ): lutest.c icc.h
-	$(CC) $(CCOF)lutest$(SUFOBJ) lutest.c
-
-lutest$(SUFEXE): lutest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-	$(LINK) $(LINKOF)lutest$(SUFEXE) lutest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-
-
-icclu$(SUFOBJ): icclu.c icc.h
-	$(CC) $(CCOF)icclu$(SUFOBJ) icclu.c
-
-icclu$(SUFEXE): icclu$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-	$(LINK) $(LINKOF)icclu$(SUFEXE) icclu$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-
-
-iccdump$(SUFOBJ): iccdump.c icc.h
-	$(CC) $(CCOF)iccdump$(SUFOBJ) iccdump.c
-
-iccdump$(SUFEXE): iccdump$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-	$(LINK) $(LINKOF)iccdump$(SUFEXE) iccdump$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-
-
-iccrw$(SUFOBJ): iccrw.c icc.h
-	$(CC) $(CCOF)iccrw$(SUFOBJ) iccrw.c
-
-iccrw$(SUFEXE): iccrw$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-	$(LINK) $(LINKOF)iccrw$(SUFEXE) iccrw$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
-
-
-
+# Empty Makefile
diff --git a/icc/Makefile.am b/icc/Makefile.am
new file mode 100644
index 0000000..091f772
--- /dev/null
+++ b/icc/Makefile.am
@@ -0,0 +1,18 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+lib_LTLIBRARIES = libicc.la
+
+libicc_la_SOURCES = icc.h iccV42.h icc.c iccstd.c
+libicc_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+include_HEADERS = icc.h iccV42.h
+
+LDADD = libicc.la
+
+bin_PROGRAMS = iccdump icclu
+
+check_PROGRAMS = icctest iccrw lutest
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/imdi/Makefile b/imdi/Makefile
index 5523893..4f7fef2 100644
--- a/imdi/Makefile
+++ b/imdi/Makefile
@@ -1,66 +1 @@
-
-# Boilerplate Makefile for compiling imdi
-
-# Copyright 2000 - 2007 Graeme W. Gill
-# This material is licenced under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3 :-
-# see the License.txt file for licencing details.
-
-# "include" the right environment for your system,
-# by uncommenting the appropriate line:
-
-# Microsoft VC++, WinNT setup
-include Makefile.WNT
-
-# Generic UNIX setup
-#include Makefile.UNIX
-
-# Apple OS X
-#include Makefile.OSX
-
-
-###############################
-
-#Set optimisation on
-CCFLAGS = $(CCFLAGSDEF) $(CCOPTFLAG) $(CCDEFINES) $(BCONFIG)
-
-#Set debugging on
-#CCFLAGS = $(CCFLAGSDEF) $(CCDEBUGFLAG) $(CCDEFINES) $(BCONFIG)
-# debugging #define
-#CCFLAGS = $(CCFLAGSDEF) $(CCDEBUGFLAG) $(CCDEFINES) $(DEFFLAG)DEBUG
-LINKFLAGS = $(LINKFLAGSDEF) $(LINKDEBUGFLAG)
-
-STDHDRS = $(INCFLAG)$(STDHDRSDEF)
-
-all:: libimdi$(SUFLIB)
-
-# Used by both code generator and runtime
-imdi_make$(SUFEXE): imdi_make$(SUFOBJ) imdi_gen$(SUFOBJ) cgen$(SUFOBJ)
-	$(LINK) $(LINKOF)imdi_make$(SUFEXE) imdi_make$(SUFOBJ) imdi_gen$(SUFOBJ) cgen$(SUFOBJ)
-
-
-# The code generator program
-
-cgen$(SUFOBJ): cgen.c imdi_utl.h imdi_arch.h imdi_gen.h imdi_tab.h
-	$(CC) cgen.c
-
-imdi_gen$(SUFOBJ): imdi_gen.c imdi_utl.h imdi_arch.h imdi_gen.h
-	$(CC) imdi_gen.c
-
-# Generate the kernel files
-imdi_k.h imdi_k.c : imdi_make$(SUFEXE)
-	.$(SLASH)imdi_make$(SUFEXE) 
-
-
-# imdi runtime library
-
-imdi$(SUFOBJ): imdi.c imdi.h imdi_tab.h imdi_k.h imdi_k.c
-	$(CC) imdi.c
-
-libimdi$(SUFLIB): imdi$(SUFOBJ) imdi_tab$(SUFOBJ)
-	$(LIBU) $(LIBOF)$@ imdi$(SUFOBJ) imdi_tab$(SUFOBJ)
-	$(RANLIB) libimdi$(SUFLIB)
-
-
-
-
-
+# Empty Makefile
diff --git a/imdi/Makefile.am b/imdi/Makefile.am
new file mode 100644
index 0000000..7ba7624
--- /dev/null
+++ b/imdi/Makefile.am
@@ -0,0 +1,36 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libimdi.la
+privatelibdir = $(pkglibdir)
+
+libimdi_la_SOURCES = imdi.c imdi_tab.c imdi_arch.h imdi_gen.h imdi.h	\
+	imdi_tab.h imdi_utl.h refi.h imdi_k.h
+
+bin_PROGRAMS = cctiff greytiff
+
+BINLDADD = ./libimdi.la ../spectro/libinsttypes.la ../plot/libvrml.la	\
+	../xicc/libxicc.la ../xicc/libxutils.la ../gamut/libgamut.la	\
+	../gamut/libgammap.la ../rspl/librspl.la $(ICC_LIBS)		\
+	../cgats/libcgats.la ../numlib/libargyllnum.la ../libargyll.la	\
+	$(TIFF_LIBS)
+
+cctiff_LDADD = $(BINLDADD)
+greytiff_LDADD = $(BINLDADD)
+
+check_PROGRAMS = ctest
+
+ctest_SOURCES = ctest.c cgen.c
+
+noinst_PROGRAMS = imdi_make
+
+imdi_make_SOURCES = imdi_make.c imdi_gen.c cgen.c
+
+BUILT_SOURCES = imdi_k.h
+
+imdi.c: imdi_k.h
+imdi_k.h: imdi_make
+	./imdi_make
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/jcnf/Makefile.am b/jcnf/Makefile.am
new file mode 100644
index 0000000..9546653
--- /dev/null
+++ b/jcnf/Makefile.am
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+SUBDIRS = yajl
+
+privatelib_LTLIBRARIES = libjcnf.la
+privatelibdir = $(pkglibdir)
+
+libjcnf_la_SOURCES = jcnf.h jcnf.c
+libjcnf_la_LIBADD = yajl/libyajl.la
+
+LDADD = ./libjcnf.la yajl/libyajl.la
+
+check_PROGRAMS = test
+
+EXTRA_DIST = Readme.txt
diff --git a/jcnf/yajl/Makefile.am b/jcnf/yajl/Makefile.am
new file mode 100644
index 0000000..5a3d25c
--- /dev/null
+++ b/jcnf/yajl/Makefile.am
@@ -0,0 +1,15 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libyajl.la
+privatelibdir = $(pkglibdir)
+
+libyajl_la_SOURCES = yajl_common.h yajl_gen.h yajl_parse.h yajl.c	\
+	yajl_alloc.c yajl_alloc.h yajl_buf.c yajl_buf.h yajl_encode.c	\
+	yajl_encode.h yajl_gen.c yajl_lex.c yajl_lex.h yajl_parser.c	\
+	yajl_parser.h
+
+LDADD = ./libyajl.la
+
+check_PROGRAMS = yajl_test json_verify
diff --git a/libusbw/Makefile b/libusbw/Makefile
index 02408ba..4f7fef2 100644
--- a/libusbw/Makefile
+++ b/libusbw/Makefile
@@ -1,263 +1 @@
-# LIBUSB-WIN32, Generic Windows USB Library
-# Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-
-# If you're cross-compiling and your mingw32 tools are called
-# i586-mingw32msvc-gcc and so on, then you can compile libusb-win32
-# by running
-#    make host_prefix=i586-mingw32msvc all
-
-
-ifdef host_prefix
-	override host_prefix := $(host_prefix)-
-endif
-
-CC = $(host_prefix)gcc
-LD = $(host_prefix)ld
-WINDRES = $(host_prefix)windres
-DLLTOOL = $(host_prefix)dlltool
-
-MAKE = make
-CP = cp
-CD = cd
-MV = mv
-RM = -rm -fr
-TAR = tar
-ISCC = iscc
-INSTALL = install
-LIB = lib
-IMPLIB = implib
-UNIX2DOS = unix2dos
-
-VERSION_MAJOR = 0
-VERSION_MINOR = 1
-VERSION_MICRO = 12
-VERSION_NANO = 1
-
-VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_NANO)
-RC_VERSION = $(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_NANO)
-RC_VERSION_STR = '\"$(VERSION)\"'
-INST_VERSION = $(VERSION)
-
-INF_DATE = $(shell date +"%m/%d/%Y")
-DATE = $(shell date +"%Y%m%d")
-
-DDK_MAKE_DIR = ./ddk_make
-
-TARGET = libusb
-DLL_TARGET = $(TARGET)$(VERSION_MAJOR)
-LIB_TARGET = $(TARGET)
-DRIVER_TARGET = $(TARGET)$(VERSION_MAJOR).sys
-
-DLL_TARGET_X64 = $(TARGET)$(VERSION_MAJOR)_x64
-DRIVER_TARGET_X64 = $(TARGET)$(VERSION_MAJOR)_x64.sys
-
-INSTALL_DIR = /usr
-DLL_OBJECTS = usb.o error.o descriptors.o windows.o resource.o install.o \
-	registry.o 
-
-DRIVER_OBJECTS = abort_endpoint.o claim_interface.o clear_feature.o \
-	dispatch.o get_configuration.o \
-	get_descriptor.o get_interface.o get_status.o \
-	ioctl.o libusb_driver.o pnp.o release_interface.o reset_device.o \
-	reset_endpoint.o set_configuration.o set_descriptor.o \
-	set_feature.o set_interface.o transfer.o vendor_request.o \
-	power.o driver_registry.o driver_debug.o libusb_driver_rc.o 
-
-INSTALLER_NAME = $(TARGET)-win32-filter-bin-$(INST_VERSION).exe
-SRC_DIST_DIR = $(TARGET)-win32-src-$(INST_VERSION)
-BIN_DIST_DIR = $(TARGET)-win32-device-bin-$(INST_VERSION)
-
-
-DIST_SOURCE_FILES = ./src
-DIST_MISC_FILES = COPYING_LGPL.txt COPYING_GPL.txt AUTHORS.txt
-
-SRC_DIR = ./src
-DRIVER_SRC_DIR = $(SRC_DIR)/driver
-
-VPATH = .:./src:./src/driver:./tests
-
-INCLUDES = -I./src -I./src/driver -I.
-
-CFLAGS = -O2 -Wall -mno-cygwin
-WIN_CFLAGS = $(CFLAGS) -mwindows
-
-CPPFLAGS = -DVERSION_MAJOR=$(VERSION_MAJOR) \
-	-DVERSION_MINOR=$(VERSION_MINOR) \
-	-DVERSION_MICRO=$(VERSION_MICRO) \
-	-DVERSION_NANO=$(VERSION_NANO) \
-	-DINF_DATE='$(INF_DATE)' \
-	-DINF_VERSION='$(VERSION)' \
-  -DDBG
-
-WINDRES_FLAGS = -I./src -DRC_VERSION='$(RC_VERSION)' \
-								-DRC_VERSION_STR=$(RC_VERSION_STR)
-
-LDFLAGS = -s -mno-cygwin -L. -lusb -lgdi32 -luser32 -lcfgmgr32 \
-	 				-lsetupapi -lcomctl32
-WIN_LDFLAGS = $(LDFLAGS) -mwindows
-
-
-DLL_LDFLAGS = -s -mdll -mno-cygwin \
-	-Wl,--kill-at \
-	-Wl,--out-implib,$(LIB_TARGET).a \
-	-Wl,--enable-stdcall-fixup \
-	-L. -lcfgmgr32 -lsetupapi 
-
-
-DRIVER_LDFLAGS = -s -shared -Wl,--entry,_DriverEntry@8 \
-	-nostartfiles -nostdlib -L. -lusbd -lntoskrnl -lhal
-
-
-EXE_FILES = testlibusb.exe testlibusb-win.exe inf-wizard.exe install-filter.exe
-
-
-.PHONY: all
-all: $(DLL_TARGET).dll $(EXE_FILES) $(DRIVER_TARGET) README.txt
-
-$(DLL_TARGET).dll: $(DLL_OBJECTS)
-	$(CC) -o $@ $(DLL_OBJECTS) $(DLL_TARGET).def $(DLL_LDFLAGS)
-
-
-$(DRIVER_TARGET): libusbd.a $(DRIVER_OBJECTS)
-	$(CC) -o $@ $(DRIVER_OBJECTS) $(DLL_TARGET)_drv.def $(DRIVER_LDFLAGS)
-
-libusbd.a:
-	$(DLLTOOL) --dllname usbd.sys --add-underscore --def ./src/driver/usbd.def \
-		--output-lib libusbd.a
-
-inf-wizard.exe: inf_wizard_rc.o inf_wizard.o registry.o error.o
-	$(CC) $(WIN_CFLAGS) -o $@ -I./src  $^ $(WIN_LDFLAGS)
-
-testlibusb.exe: testlibusb.o
-	$(CC) $(CFLAGS) -o $@ -I./src  $^ $(LDFLAGS)
-
-install-filter.exe: install_filter.o
-	$(CC) $(CFLAGS) -o $@ -I./src  $^ $(WIN_LDFLAGS)
-
-testlibusb-win.exe: testlibusb_win.o testlibusb_win_rc.o
-	$(CC) $(WIN_CFLAGS) -o $@ -I./src  $^ $(WIN_LDFLAGS)
-
-%.o: %.c libusb_driver.h driver_api.h
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(INCLUDES) 
-
-%.o: %.rc
-	$(WINDRES) $(WINDRES_FLAGS) $< -o $@
-
-README.txt: README.in
-	sed -e 's/@VERSION@/$(INST_VERSION)/' $< > $@
-
-
-.PHONY: bcc_implib
-bcc_lib:
-	$(IMPLIB) -a $(LIB_TARGET).lib $(DLL_TARGET).dll
-
-.PHONY: msvc_lib
-msvc_lib:
-	$(LIB) /machine:i386 /def:$(DLL_TARGET).def 
-	$(MV) $(DLL_TARGET).lib $(LIB_TARGET).lib
-
-.PHONY: bin_dist
-bin_dist: all
-	$(INSTALL) -d $(BIN_DIST_DIR)/lib/gcc
-	$(INSTALL) -d $(BIN_DIST_DIR)/lib/bcc
-	$(INSTALL) -d $(BIN_DIST_DIR)/lib/msvc
-	$(INSTALL) -d $(BIN_DIST_DIR)/lib/msvc_x64
-	$(INSTALL) -d $(BIN_DIST_DIR)/lib/dynamic
-	$(INSTALL) -d $(BIN_DIST_DIR)/include
-	$(INSTALL) -d $(BIN_DIST_DIR)/bin
-	$(INSTALL) -d $(BIN_DIST_DIR)/examples
-
-	$(INSTALL) $(EXE_FILES) $(BIN_DIST_DIR)/bin
-
-	$(INSTALL) $(DRIVER_TARGET) $(BIN_DIST_DIR)/bin
-	$(INSTALL) $(DLL_TARGET).dll $(BIN_DIST_DIR)/bin
-
-	$(INSTALL) $(DDK_MAKE_DIR)/$(DRIVER_TARGET) $(BIN_DIST_DIR)/bin/$(DRIVER_TARGET_X64)
-	$(INSTALL) $(DDK_MAKE_DIR)/$(DLL_TARGET).dll $(BIN_DIST_DIR)/bin/$(DLL_TARGET_X64).dll
-
-	$(INSTALL) $(SRC_DIR)/usb.h $(BIN_DIST_DIR)/include
-	$(INSTALL) $(LIB_TARGET).a $(BIN_DIST_DIR)/lib/gcc
-	$(MAKE) bcc_lib 
-	$(INSTALL) $(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/bcc
-	$(MAKE) msvc_lib
-	$(INSTALL) $(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/msvc
-	$(INSTALL) $(DDK_MAKE_DIR)/$(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/msvc_x64
-	$(INSTALL) $(SRC_DIR)/libusb_dyn.c $(BIN_DIST_DIR)/lib/dynamic
-	$(INSTALL) $(DIST_MISC_FILES) README.txt $(BIN_DIST_DIR)
-	$(INSTALL) ./examples/*.iss $(BIN_DIST_DIR)/examples
-	$(INSTALL) ./examples/*.c $(BIN_DIST_DIR)/examples
-	$(UNIX2DOS) $(BIN_DIST_DIR)/examples/*.iss
-	$(UNIX2DOS) $(BIN_DIST_DIR)/*.txt
-
-.PHONY: src_dist
-src_dist:
-	$(INSTALL) -d $(SRC_DIST_DIR)/src
-	$(INSTALL) -d $(SRC_DIST_DIR)/src/driver
-	$(INSTALL) -d $(SRC_DIST_DIR)/tests
-	$(INSTALL) -d $(SRC_DIST_DIR)/examples
-	$(INSTALL) -d $(SRC_DIST_DIR)/ddk_make
-
-	$(INSTALL) $(SRC_DIR)/*.c $(SRC_DIST_DIR)/src
-	$(INSTALL) $(SRC_DIR)/*.h $(SRC_DIST_DIR)/src
-	$(INSTALL) $(SRC_DIR)/*.rc $(SRC_DIST_DIR)/src
-
-	$(INSTALL) ./examples/*.iss $(SRC_DIST_DIR)/examples
-	$(INSTALL) ./ddk_make/sources* $(SRC_DIST_DIR)/ddk_make
-	$(INSTALL) ./ddk_make/makefile $(SRC_DIST_DIR)/ddk_make
-	$(INSTALL) ./ddk_make/*.txt $(SRC_DIST_DIR)/ddk_make
-	$(INSTALL) ./ddk_make/*.bat $(SRC_DIST_DIR)/ddk_make
-	$(UNIX2DOS)	$(SRC_DIST_DIR)/ddk_make/*
-
-	$(INSTALL) $(SRC_DIR)/driver/*.h $(SRC_DIST_DIR)/src/driver
-	$(INSTALL) $(SRC_DIR)/driver/*.c $(SRC_DIST_DIR)/src/driver
-	$(INSTALL) $(SRC_DIR)/driver/*.def $(SRC_DIST_DIR)/src/driver
-	$(INSTALL) $(SRC_DIR)/driver/*.rc $(SRC_DIST_DIR)/src/driver
-
-	$(INSTALL) ./tests/*.c $(SRC_DIST_DIR)/tests
-	$(INSTALL) ./tests/*.rc $(SRC_DIST_DIR)/tests
-	$(INSTALL) $(DIST_MISC_FILES) *.in Makefile manifest.txt *.def \
-		installer_license.txt $(SRC_DIST_DIR)
-	$(UNIX2DOS) $(SRC_DIST_DIR)/*.txt
-
-
-.PHONY: dist
-dist: bin_dist src_dist
-	sed -e 's/@VERSION@/$(INST_VERSION)/' \
-		-e 's/@BIN_DIST_DIR@/$(BIN_DIST_DIR)/' \
-		-e 's/@SRC_DIST_DIR@/$(SRC_DIST_DIR)/' \
-		-e 's/@INSTALLER_TARGET@/$(INSTALLER_TARGET)/' \
-		install.iss.in > install.iss
-	$(UNIX2DOS) install.iss
-	$(TAR) -czf $(SRC_DIST_DIR).tar.gz $(SRC_DIST_DIR) 
-	$(TAR) -czf $(BIN_DIST_DIR).tar.gz $(BIN_DIST_DIR)
-	$(ISCC) install.iss
-	$(RM) $(SRC_DIST_DIR)
-	$(RM) $(BIN_DIST_DIR)
-
-.PHONY: snapshot
-snapshot: INST_VERSION = $(DATE)
-snapshot: dist
-
-.PHONY: clean
-clean:	
-	$(RM) *.o *.dll *.a *.exp *.lib *.exe *.tar.gz *~ *.iss *.rc *.h
-	$(RM) ./src/*~ *.sys *.log
-	$(RM) $(DRIVER_SRC_DIR)/*~
-	$(RM) README.txt
-
+# Empty Makefile
diff --git a/link/Makefile.am b/link/Makefile.am
new file mode 100644
index 0000000..c2fc898
--- /dev/null
+++ b/link/Makefile.am
@@ -0,0 +1,13 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+LDADD = ../spectro/libinsttypes.la ../xicc/libxicc.la			\
+	../xicc/libxutils.la ../gamut/libgamut.la			\
+	../gamut/libgammap.la ../plot/libplot.la ../plot/libvrml.la	\
+	../rspl/librspl.la $(ICC_LIBS) ../cgats/libcgats.la		\
+	../numlib/libargyllnum.la $(X_LIBS) $(TIFF_LIBS)
+
+bin_PROGRAMS = collink pathplot
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/numlib/Makefile.am b/numlib/Makefile.am
new file mode 100644
index 0000000..dfe2b9e
--- /dev/null
+++ b/numlib/Makefile.am
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libargyllnum.la
+privatelibdir = $(pkglibdir)
+
+libargyllnum_la_SOURCES = numlib.h numsup.c numsup.h dnsq.c dnsq.h	\
+	powell.c powell.h dhsx.c dhsx.h ludecomp.c ludecomp.h svd.c	\
+	svd.h zbrent.c zbrent.h rand.c rand.h sobol.c sobol.h aatree.c
+
+LDADD = ./libargyllnum.la
+
+check_PROGRAMS = dnsqtest tpowell tdhsx LUtest svdtest zbrenttest	\
+	soboltest
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/plot/Makefile.am b/plot/Makefile.am
new file mode 100644
index 0000000..6a57e4f
--- /dev/null
+++ b/plot/Makefile.am
@@ -0,0 +1,14 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libplot.la libvrml.la
+privatelibdir = $(pkglibdir)
+
+libplot_la_SOURCES = plot.h plot.c
+libplot_la_LIBADD = $(X_LIBS)
+
+libvrml_la_SOURCES = vrml.h vrml.c
+libvrml_la_LIBADD = $(ICC_LIBS) ../numlib/libargyllnum.la
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/profile/Makefile.am b/profile/Makefile.am
new file mode 100644
index 0000000..cf2afa8
--- /dev/null
+++ b/profile/Makefile.am
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libprof.la
+privatelibdir = $(pkglibdir)
+
+libprof_la_SOURCES = prof.h profin.c profout.c
+libprof_la_LIBADD = ../gamut/libgammap.la $(ICC_LIBS)		\
+	../gamut/libgamut.la ../xicc/libxicc.la			\
+	../numlib/libargyllnum.la ../spectro/libinsttypes.la	\
+	../xicc/libxutils.la ../libargyll.la
+
+LDADD = ./libprof.la ../xicc/libxutils.la ../spectro/libinst.la		\
+	../xicc/libxicc.la ../spectro/libinsttypes.la			\
+	../gamut/libgamut.la ../gamut/libgammap.la ../plot/libvrml.la	\
+	../plot/libplot.la ../rspl/librspl.la				\
+	../numlib/libargyllnum.la $(ICC_LIBS) ../cgats/libcgats.la	\
+	../libargyll.la $(TIFF_LIBS) -lusb
+
+bin_PROGRAMS = simpprof profcheck invprofcheck mppcheck verify \
+	colprof printcal applycal sepgen
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/ref/Makefile.am b/ref/Makefile.am
new file mode 100644
index 0000000..bba364e
--- /dev/null
+++ b/ref/Makefile.am
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+refdir = $(datadir)/color/argyll/ref
+
+ref_DATA = CMP_DT_003.cht ColorChecker.cht ColorChecker.ti2		\
+	ColorCheckerDC.cht ColorCheckerSG.cht ECI2002R.ti2		\
+	FograStrip.ti1 FograStrip.ti2 Hutchcolor.cht QPcard_201.cht	\
+	i1_RGB_Scan_1.4.cht i1_RGB_Scan_1.4.ti2 it8.cht 3dap5k.sp	\
+	D50_0.0.sp D50_0.3.sp D50_0.5.sp D50_0.7.sp D50_1.0.sp		\
+	D50_1.2.sp D50_1.5.sp D50_1.7.sp D50_2.0.sp D50_2.5.sp		\
+	D50_3.0.sp GTIPlus.sp Office.sp SOtele.sp Trulux.sp		\
+	TruluxPlus.sp example.sp example121.sp strange.cal
+
+EXTRA_DIST = CMP_DT_003.cht ColorChecker.cht ColorChecker.ti2		\
+	ColorCheckerDC.cht ColorCheckerSG.cht ECI2002R.ti2		\
+	FograStrip.ti1 FograStrip.ti2 Hutchcolor.cht QPcard_201.cht	\
+	i1_RGB_Scan_1.4.cht i1_RGB_Scan_1.4.ti2 it8.cht 3dap5k.sp	\
+	D50_0.0.sp D50_0.3.sp D50_0.5.sp D50_0.7.sp D50_1.0.sp		\
+	D50_1.2.sp D50_1.5.sp D50_1.7.sp D50_2.0.sp D50_2.5.sp		\
+	D50_3.0.sp GTIPlus.sp Office.sp SOtele.sp Trulux.sp		\
+	TruluxPlus.sp example.sp example121.sp strange.cal
diff --git a/render/Makefile.am b/render/Makefile.am
new file mode 100644
index 0000000..9b66ee8
--- /dev/null
+++ b/render/Makefile.am
@@ -0,0 +1,15 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = librender.la
+privatelibdir = $(pkglibdir)
+
+librender_la_SOURCES = render.h render.c
+librender_la_LIBADD = $(TIFF_LIBS) ../numlib/libargyllnum.la
+
+LDADD = ./librender.la ../numlib/libargyllnum.la $(TIFF_LIBS)
+
+check_PROGRAMS = timage
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/rspl/Makefile.am b/rspl/Makefile.am
new file mode 100644
index 0000000..ef3c0ea
--- /dev/null
+++ b/rspl/Makefile.am
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = librspl.la
+privatelibdir = $(pkglibdir)
+
+librspl_la_SOURCES = rspl.h rspl_imp.h mlbs.h rspl.c scat.c rev.c	\
+	rev.h gam.c spline.c opt.c
+librspl_la_LIBADD = ../numlib/libargyllnum.la ../plot/libvrml.la
+
+LDADD = ./librspl.la ../numlib/libargyllnum.la ../plot/libplot.la	\
+	../plot/libvrml.la $(X_LIBS) $(TIFF_LIBS) $(ICC_LIBS)
+
+check_PROGRAMS = revbench c1 c1df t2d t2ddf t3d t3ddf tnd trnd
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/scanin/Makefile.am b/scanin/Makefile.am
new file mode 100644
index 0000000..1e8f130
--- /dev/null
+++ b/scanin/Makefile.am
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libscanrd.la
+privatelibdir = $(pkglibdir)
+
+libscanrd_la_SOURCES = scanrd.h scanrd_.h scanrd.c
+libscanrd_la_LIBADD = ../rspl/librspl.la ../numlib/libargyllnum.la
+
+LDADD = ./libscanrd.la ../numlib/libargyllnum.la $(ICC_LIBS)	\
+	../cgats/libcgats.la ../xicc/libxicc.la $(TIFF_LIBS)	\
+	../libargyll.la
+
+bin_PROGRAMS = scanin
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/spectro/Makefile.am b/spectro/Makefile.am
new file mode 100644
index 0000000..0dd1733
--- /dev/null
+++ b/spectro/Makefile.am
@@ -0,0 +1,44 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libinsttypes.la libconv.la libinst.la libdisp.la
+privatelibdir = $(pkglibdir)
+
+libinsttypes_la_SOURCES = insttypes.h insttypes.c insttypeinst.h
+libinsttypes_la_LIBADD = ../libargyll.la
+
+libinst_la_SOURCES = inst.h inst.c insttypes.c dtp20.c dtp20.h dtp22.c	\
+	dtp22.h dtp41.c dtp41.h dtp51.c dtp51.h dtp92.c dtp92.h		\
+	i1disp.c i1disp.h i1pro.c i1pro.h i1pro_imp.c i1pro_imp.h	\
+	munki.c munki_imp.c ss.c ss.h ss_imp.c ss_imp.h hcfr.c hcfr.h	\
+	spyd2.c spyd2.h spyd2setup.h spyd2PLD.h huey.c huey.h unixio.c	\
+	usbio.c hidio.c pollem.c pollem.h icoms.h conv.h usbio.h	\
+	hidio.h
+libinst_la_LIBADD = -lusb $(ICC_LIBS) ../numlib/libargyllnum.la	\
+	../libargyll.la ../rspl/librspl.la libconv.la
+
+libdisp_la_SOURCES = dispsup.c dispwin.c dispwin.h dispsup.h
+libdisp_la_LIBADD = $(X_LIBS) ../ucmm/libucmm.la $(ICC_LIBS)	\
+	../numlib/libargyllnum.la libconv.la libinst.la ../libargyll.la
+
+libconv_la_SOURCES = conv.c xdg_bds.c pollem.c
+libconv_la_LIBADD = ../libargyll.la
+
+LDADD = ./libinsttypes.la ./libdisp.la ./libinst.la ./libconv.la	\
+	../ucmm/libucmm.la ../jcnf/libjcnf.la ../jcnf/yajl/libyajl.la	\
+	../xicc/libxicc.la $(ICC_LIBS) ../cgats/libcgats.la		\
+	../rspl/librspl.la ../gamut/libgamut.la ../target/libtarget.la	\
+	../plot/libplot.la ../numlib/libargyllnum.la $(X_LIBS) -lusb	\
+	../libargyll.la
+
+bin_PROGRAMS = synthcal dispwin dispread dispcal fakeread synthread	\
+	chartread spotread spec2cie average spyd2en ccmxmake
+
+dispwin_CFLAGS = $(AM_CFLAGS) -DSTANDALONE_TEST
+
+synthcal_DEPENDENCIES = ../gamut/libgammap.la ../target/libtarget.la
+
+spyd2en_SOURCES = spyd2en.c vinflate.c
+
+EXTRA_DIST = Readme.txt
diff --git a/target/Makefile.am b/target/Makefile.am
new file mode 100644
index 0000000..0923242
--- /dev/null
+++ b/target/Makefile.am
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libtarget.la
+privatelibdir = $(pkglibdir)
+
+libtarget_la_SOURCES = alphix.c alphix.h randix.c randix.h
+
+LDADD = ./libtarget.la ../rspl/librspl.la ../plot/libvrml.la	\
+	$(ICC_LIBS) ../render/librender.la ../cgats/libcgats.la	\
+	../xicc/libxicc.la ../gamut/libgamut.la			\
+	../spectro/libinsttypes.la ../spectro/libconv.la	\
+	../numlib/libargyllnum.la $(TIFF_LIBS)
+
+bin_PROGRAMS = targen printtarg
+
+targen_DEPENDENCIES = ../spectro/libinsttypes.la
+targen_SOURCES = targen.c targen.h ofps.c ofps.h ifarp.c ifarp.h	\
+	simplat.c simplat.h simdlat.c simdlat.h prand.c prand.h
+
+printtarg_SOURCES = printtarg.c 
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/tweak/Makefile.am b/tweak/Makefile.am
new file mode 100644
index 0000000..b71ea63
--- /dev/null
+++ b/tweak/Makefile.am
@@ -0,0 +1,13 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+LDADD = ../spectro/libinsttypes.la ../gamut/libgamut.la			\
+	../gamut/libgammap.la ../plot/libvrml.la ../xicc/libxutils.la	\
+	../xicc/libxicc.la ../rspl/librspl.la ../gamut/libgamut.la	\
+	../gamut/libgammap.la $(ICC_LIBS) ../cgats/libcgats.la		\
+	../numlib/libargyllnum.la $(TIFF_LIBS)
+
+bin_PROGRAMS = refine
+
+EXTRA_DIST = License.txt Readme.txt
diff --git a/ucmm/Makefile.am b/ucmm/Makefile.am
new file mode 100644
index 0000000..54b8db8
--- /dev/null
+++ b/ucmm/Makefile.am
@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libucmm.la
+privatelibdir = $(pkglibdir)
+
+libucmm_la_SOURCES = ucmm.h ucmm.c
+libucmm_la_LIBADD = $(ICC_LIBS) ../jcnf/libjcnf.la
diff --git a/xicc/Makefile.am b/xicc/Makefile.am
new file mode 100644
index 0000000..729a941
--- /dev/null
+++ b/xicc/Makefile.am
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libxicc.la libxutils.la
+privatelibdir = $(pkglibdir)
+
+libxicc_la_SOURCES = xicc.h xicc.c xlutfix.c xspect.c xspect.h xsep.c	\
+	xsep.h xdevlin.c xdevlin.h xcam.c xcam.h cam97s3.c cam97s3.h	\
+	cam02.c cam02.h mpp.c xfit.c xfit.h moncurve.c moncurve.h	\
+	mpp.h xdgb.c ccmx.c ccmx.h
+libxicc_la_LIBADD = $(ICC_LIBS) ../gamut/libgamut.la		\
+	../numlib/libargyllnum.la ../spectro/libinsttypes.la	\
+	../cgats/libcgats.la ../rspl/librspl.la ../libargyll.la
+
+libxutils_la_SOURCES = xutils.h xutils.c
+libxutils_la_LIBADD = $(TIFF_LIBS) $(ICC_LIBS)
+
+LDADD = ./libxicc.la ./libxutils.la ../rspl/librspl.la			\
+	../numlib/libargyllnum.la ../gamut/libgamut.la			\
+	../gamut/libgammap.la ../spectro/libinsttypes.la $(ICC_LIBS)	\
+	../cgats/libcgats.la ../plot/libvrml.la ../plot/libplot.la	\
+	$(TIFF_LIBS) $(X_LIBS) -lusb ../libargyll.la
+
+bin_PROGRAMS = fakeCMY iccgamut mpplu revfix tiffgamut xicclu	\
+	extracticc extractttag specplot ccttest
+
+fakeCMY_DEPENDENCIES = ../spectro/libinsttypes.la	\
+	../gamut/libgammap.la ../target/libtarget.la
+
+EXTRA_DIST = xmono.c xmatrix.c xlut.c