0fafbd9
diff -uNr argyllcms-0.70.orig/cgats/Jamfile argyllcms-0.70/cgats/Jamfile
0fafbd9
--- argyllcms-0.70.orig/cgats/Jamfile	2008-01-16 02:47:37.000000000 +0100
0fafbd9
+++ argyllcms-0.70/cgats/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -3,7 +3,7 @@
0fafbd9
 
0fafbd9
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
0fafbd9
 #CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
0fafbd9
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;
0fafbd9
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;
0fafbd9
 
0fafbd9
 #if stdio is not wanted in icclib:
0fafbd9
 #CCFLAGS	+= $(DEFFLAG)SEPARATE_STD ;
0fafbd9
diff -uNr argyllcms-0.70.orig/gamut/Jamfile argyllcms-0.70/gamut/Jamfile
0fafbd9
--- argyllcms-0.70.orig/gamut/Jamfile	2008-01-16 02:47:39.000000000 +0100
0fafbd9
+++ argyllcms-0.70/gamut/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -6,7 +6,7 @@
0fafbd9
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
0fafbd9
 #CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
0fafbd9
 #CCFLAGS		+= $(CCHEAPDEBUG) ;		# Heap Debugging flags
0fafbd9
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;      # Link with debug info
0fafbd9
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;      # Link with debug info
0fafbd9
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
0fafbd9
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
0fafbd9
 
0fafbd9
diff -uNr argyllcms-0.70.orig/imdi/Jamfile argyllcms-0.70/imdi/Jamfile
0fafbd9
--- argyllcms-0.70.orig/imdi/Jamfile	2008-01-16 02:47:45.000000000 +0100
0fafbd9
+++ argyllcms-0.70/imdi/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -5,14 +5,16 @@
0fafbd9
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
0fafbd9
 #CCFLAGS	    += $(CCDEBUGFLAG) ;		# Debugging flags
0fafbd9
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
0fafbd9
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
0fafbd9
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;	# Link debugging flags
0fafbd9
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
0fafbd9
 #CCFLAGS	+= $(CCHEAPDEBUG) ;		# Heap Debugging flags
0fafbd9
 
0fafbd9
 if $(HAVE_TIFF) {	# Alternate TIFF library
0fafbd9
 	TIFFLIB = ;
0fafbd9
 	TIFFINC = ;
0fafbd9
-	LINKLIBS on cctiff$(SUFEXE) = -ltiff $(LINKLIBS) ;
0fafbd9
+	LINKLIBS on cctiff$(SUFEXE)
0fafbd9
+	            cctiffo$(SUFEXE)
0fafbd9
+	            greytiff$(SUFEXE)	= -ltiff $(LINKLIBS) ;
0fafbd9
 } else {
0fafbd9
 	TIFFLIB = ../tiff/libtiff.lib ;
0fafbd9
 	TIFFINC = ../tiff ;
0fafbd9
diff -uNr argyllcms-0.70.orig/Jambase argyllcms-0.70/Jambase
0fafbd9
--- argyllcms-0.70.orig/Jambase	2008-01-16 02:47:16.000000000 +0100
0fafbd9
+++ argyllcms-0.70/Jambase	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -259,7 +259,7 @@
0fafbd9
 	FILEMODE		default = 644 ;
0fafbd9
 	FORTRAN			default = f77 ;
0fafbd9
 	FORTRANFLAGS	default = ;
0fafbd9
-#   HAVE_TIFF		default = 1 ;
0fafbd9
+	HAVE_TIFF		default = 1 ;
0fafbd9
 	HDRS			default = ;
0fafbd9
 	INSTALL			default = install -c ;
0fafbd9
 	LEX				default = lex ;
0fafbd9
diff -uNr argyllcms-0.70.orig/link/Jamfile argyllcms-0.70/link/Jamfile
0fafbd9
--- argyllcms-0.70.orig/link/Jamfile	2008-01-16 02:47:49.000000000 +0100
0fafbd9
+++ argyllcms-0.70/link/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -10,9 +10,9 @@
0fafbd9
 LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
0fafbd9
 
0fafbd9
 if $(UNIX) && $(OS) != MACOSX {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include/X11 ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD = ;
0fafbd9
 	LibWin = ;
0fafbd9
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
 }
0fafbd9
diff -uNr argyllcms-0.70.orig/numlib/Jamfile argyllcms-0.70/numlib/Jamfile
0fafbd9
--- argyllcms-0.70.orig/numlib/Jamfile	2008-01-16 02:47:17.000000000 +0100
0fafbd9
+++ argyllcms-0.70/numlib/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -3,7 +3,7 @@
0fafbd9
 
0fafbd9
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
0fafbd9
 #CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
0fafbd9
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;
0fafbd9
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;
0fafbd9
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
0fafbd9
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
0fafbd9
 
0fafbd9
diff -uNr argyllcms-0.70.orig/numlib/numsup.c argyllcms-0.70/numlib/numsup.c
0fafbd9
--- argyllcms-0.70.orig/numlib/numsup.c	2008-01-16 02:47:17.000000000 +0100
0fafbd9
+++ argyllcms-0.70/numlib/numsup.c	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -5,6 +5,7 @@
0fafbd9
 #include <stdlib.h>
0fafbd9
 #include <math.h>
0fafbd9
 #include <string.h>
0fafbd9
+#include <limits.h>
0fafbd9
 #if defined (NT)
0fafbd9
 #define WIN32_LEAN_AND_MEAN
0fafbd9
 #include <windows.h>
0fafbd9
diff -uNr argyllcms-0.70.orig/plot/Jamfile argyllcms-0.70/plot/Jamfile
0fafbd9
--- argyllcms-0.70.orig/plot/Jamfile	2008-01-16 02:47:35.000000000 +0100
0fafbd9
+++ argyllcms-0.70/plot/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -6,11 +6,11 @@
0fafbd9
 LINKFLAGS	+= $(LINKDEBUGFLAG) ;
0fafbd9
 
0fafbd9
 if $(UNIX) && $(OS) != MACOSX {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD = ;
0fafbd9
 	LibWin = ;
0fafbd9
-	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
+	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp -lm ;
0fafbd9
 }
0fafbd9
 
0fafbd9
 # PLOT library
0fafbd9
diff -uNr argyllcms-0.70.orig/profile/Jamfile argyllcms-0.70/profile/Jamfile
0fafbd9
--- argyllcms-0.70.orig/profile/Jamfile	2008-01-16 02:47:48.000000000 +0100
0fafbd9
+++ argyllcms-0.70/profile/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -11,9 +11,9 @@
0fafbd9
 	LINKFLAGS += -framework IOKit ;
0fafbd9
 	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
   } else {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include/X11 ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD = ;
0fafbd9
 	LibWin = ;
0fafbd9
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
   }
0fafbd9
diff -uNr argyllcms-0.70.orig/render/Jamfile argyllcms-0.70/render/Jamfile
0fafbd9
--- argyllcms-0.70.orig/render/Jamfile	2008-01-16 02:47:50.000000000 +0100
0fafbd9
+++ argyllcms-0.70/render/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -10,6 +10,16 @@
0fafbd9
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
0fafbd9
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
0fafbd9
 
0fafbd9
+if $(HAVE_TIFF) {	# Alternate TIFF library
0fafbd9
+	TIFFLIB = ;
0fafbd9
+	TIFFINC = ;
0fafbd9
+	LINKLIBS on timage$(SUFEXE) = $(LINKLIBS) -ltiff ;
0fafbd9
+
0fafbd9
+} else {
0fafbd9
+	TIFFLIB = ../tiff/libtiff.lib ;
0fafbd9
+	TIFFINC = ../tiff ;
0fafbd9
+}
0fafbd9
+
0fafbd9
 #Products
0fafbd9
 Libraries = librender ;
0fafbd9
 Executables = timage ;
0fafbd9
@@ -22,11 +32,11 @@
0fafbd9
 
0fafbd9
 # 2D Rendering library
0fafbd9
 Library librender.lib : render.c ;
0fafbd9
-ObjectHdrs render$(SUFOBJ) : ../h ../numlib ../tiff ;
0fafbd9
+ObjectHdrs render$(SUFOBJ) : ../h ../numlib $(TIFFINC) ;
0fafbd9
 
0fafbd9
 Main timage : timage.c ;
0fafbd9
-ObjectHdrs timage$(SUFOBJ) : ../h ../numlib ../tiff ;
0fafbd9
-LinkLibraries timage : librender.lib ../numlib/libnum.lib ../tiff/libtiff.lib ;
0fafbd9
+ObjectHdrs timage$(SUFOBJ) : ../h ../numlib $(TIFFINC) ;
0fafbd9
+LinkLibraries timage : librender.lib ../numlib/libnum.lib $(TIFFLIB) ;
0fafbd9
 
0fafbd9
 if $(BUILD_JUNK) {
0fafbd9
 
0fafbd9
diff -uNr argyllcms-0.70.orig/rspl/Jamfile argyllcms-0.70/rspl/Jamfile
0fafbd9
--- argyllcms-0.70.orig/rspl/Jamfile	2008-01-16 02:47:38.000000000 +0100
0fafbd9
+++ argyllcms-0.70/rspl/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -16,9 +16,9 @@
0fafbd9
 	LINKFLAGS += -framework IOKit ;
0fafbd9
 	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
   } else {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include/X11 ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD = ;
0fafbd9
 	LibWin = ;
0fafbd9
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
   }
0fafbd9
@@ -28,12 +28,13 @@
0fafbd9
 
0fafbd9
 if $(HAVE_TIFF) {	# Alternate TIFF library
0fafbd9
 	TIFFLIB = ;
0fafbd9
-	TIFFINC = ;
0fafbd9
+	TIFFINC = /usr/include ;
0fafbd9
 	LINKLIBS on c1$(SUFEXE)
0fafbd9
 				c1df$(SUFEXE)
0fafbd9
 				c1i$(SUFEXE)
0fafbd9
 				t2d$(SUFEXE)
0fafbd9
 				t2dfw$(SUFEXE)
0fafbd9
+				t2ddf$(SUFEXE)
0fafbd9
 				t3d$(SUFEXE)
0fafbd9
 				t3ddf$(SUFEXE)
0fafbd9
 				tnd$(SUFEXE)
0fafbd9
diff -uNr argyllcms-0.70.orig/spectro/Jamfile argyllcms-0.70/spectro/Jamfile
0fafbd9
--- argyllcms-0.70.orig/spectro/Jamfile	2008-01-16 02:47:42.000000000 +0100
0fafbd9
+++ argyllcms-0.70/spectro/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -17,7 +17,7 @@
0fafbd9
 
0fafbd9
 if $(UNIX) {
0fafbd9
 	IOFILE = unixio.c pollem.c ;
0fafbd9
-	LIBUSB = ../libusb ;
0fafbd9
+#	LIBUSB = ../libusb ;
0fafbd9
 }
0fafbd9
 
0fafbd9
 if $(UNIX) {
0fafbd9
@@ -25,11 +25,11 @@
0fafbd9
 	LINKFLAGS += -framework IOKit ;
0fafbd9
 	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
   } else {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD =  ;
0fafbd9
 	LibWin = ;
0fafbd9
-	LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl ;
0fafbd9
+	LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl -lm -lusb ;
0fafbd9
   }
0fafbd9
 }
0fafbd9
 
0fafbd9
diff -uNr argyllcms-0.70.orig/spectro/Jamfile.orig argyllcms-0.70/spectro/Jamfile.orig
0fafbd9
--- argyllcms-0.70.orig/spectro/Jamfile.orig	1970-01-01 01:00:00.000000000 +0100
0fafbd9
+++ argyllcms-0.70/spectro/Jamfile.orig	2008-01-16 02:47:42.000000000 +0100
0fafbd9
@@ -0,0 +1,222 @@
0fafbd9
+
0fafbd9
+#SubDir TOP spectro ;
0fafbd9
+
0fafbd9
+CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
0fafbd9
+#CCFLAGS    += $(CCDEBUGFLAG) ;		# Debugging flags
0fafbd9
+LINKFLAGS	+= $(LINKDEBUGFLAG) ;
0fafbd9
+
0fafbd9
+if $(NT) {
0fafbd9
+	if $(DDK_INC_PATH) && $(DDK_LIB_PATH) {		# We can use HID access
0fafbd9
+		CCFLAGS += $(DEFFLAG) ENABLE_NT_HID ;
0fafbd9
+		HIDLIBS = $(DDK_LIB_PATH)\\hid.lib $(DDK_LIB_PATH)\\setupapi.lib ;
0fafbd9
+		HDRS += $(STDHDRS) ;					# hack to force search of STDHDRS before DDK
0fafbd9
+	}
0fafbd9
+	IOFILE = ntio.c ;
0fafbd9
+	LIBUSB = ../libusbw ;
0fafbd9
+}
0fafbd9
+
0fafbd9
+if $(UNIX) {
0fafbd9
+	IOFILE = unixio.c pollem.c ;
0fafbd9
+	LIBUSB = ../libusb ;
0fafbd9
+}
0fafbd9
+
0fafbd9
+if $(UNIX) {
0fafbd9
+  if $(OS) = MACOSX {
0fafbd9
+	LINKFLAGS += -framework IOKit ;
0fafbd9
+	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
+  } else {
0fafbd9
+	WinDir = /usr/X11R6 ;
0fafbd9
+	LibWinH = $(WinDir)/include ;
0fafbd9
+	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWin = ;
0fafbd9
+	LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl ;
0fafbd9
+  }
0fafbd9
+}
0fafbd9
+
0fafbd9
+KEEPOBJS = true ;	# Jam has trouble with multiple users of .obj
0fafbd9
+
0fafbd9
+#Products
0fafbd9
+Libraries = libinsttypes libinst ;
0fafbd9
+Executables = dispwin displin dispread dispcal fakeread synthread chartread spotread spec2cie spyd2en ;
0fafbd9
+Headers = inst.h ;
0fafbd9
+Samples = ColorChecker.ti2 ECI2002R.ti2 FograStrip.ti2 i1_RGB_Scan_1.4.ti2 SOtele.sp ;
0fafbd9
+
0fafbd9
+#Install
0fafbd9
+InstallBin $(DOTDOT)$(SLASH)bin : $(Executables)$(SUFEXE) ;
0fafbd9
+InstallFile $(DOTDOT)$(SLASH)ref : $(Samples) ;
0fafbd9
+#InstallFile $(DOTDOT)$(SLASH)h : $(Headers) ;
0fafbd9
+#InstallLib $(DOTDOT)$(SLASH)lib : $(Libraries)$(SUFLIB) ;
0fafbd9
+
0fafbd9
+# Instrument access library library
0fafbd9
+Library libinst.lib : inst.c insttypes.c dtp20.c dtp22.c dtp41.c dtp51.c dtp92.c i1disp.c i1pro.c i1pro_imp.c ss.c ss_imp.c hcfr.c spyd2.c huey.c $(IOFILE) usbio.c hidio.c ;
0fafbd9
+ObjectHdrs inst insttypes dtp20 dtp22 dtp41 dtp51 dtp92 i1disp i1pro i1pro_imp ss ss_imp hcfr spyd2 huey $(IOFILE) usbio.c hidio.c : . ../h ../numlib ../icc ../rspl ../xicc ../plot $(DDK_INC_PATH) $(LIBUSB) ;
0fafbd9
+
0fafbd9
+# Instrument types utility functions library. Use this instead of libinst */
0fafbd9
+# (hack to re-use insttypes.c in this library)
0fafbd9
+Object insttypes_$(SUFOBJ) : insttypes.c ;
0fafbd9
+ObjectHdrs insttypes_ : . ../h ../icc ../xicc ;
0fafbd9
+LibraryFromObjects libinsttypes.lib : insttypes_$(SUFOBJ) ;
0fafbd9
+
0fafbd9
+# Support file
0fafbd9
+Object alphix$(SUFOBJ) : ../target/alphix.c ;
0fafbd9
+ObjectHdrs alphix$(SUFOBJ) : ../h ../numlib ;
0fafbd9
+
0fafbd9
+# General target reader program
0fafbd9
+Object chartread$(SUFOBJ) : chartread.c ;
0fafbd9
+ObjectHdrs chartread : . ../h ../cgats ../icc ../numlib ../xicc ../target $(LIBUSB) ;
0fafbd9
+MainFromObjects chartread : chartread$(SUFOBJ) alphix$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
0fafbd9
+LinkLibraries chartread : libinst.lib ../cgats/libcgats.lib
0fafbd9
+                          ../rspl/librspl.lib
0fafbd9
+                          ../xicc/libxicc.lib ../xicc/libxcolorants.lib
0fafbd9
+                          ../numlib/libnum.lib ../icc/libicc.lib
0fafbd9
+                          ../plot/libplot.lib $(LIBUSB)/libusb.lib
0fafbd9
+                          $(HIDLIBS) ;
0fafbd9
+
0fafbd9
+# Printed target spot reader utility
0fafbd9
+Object spotread$(SUFOBJ) : spotread.c ;
0fafbd9
+ObjectHdrs spotread : . ../h ../cgats ../icc ../numlib ../rspl ../xicc ../gamut
0fafbd9
+                      ../spectro ../plot $(LIBUSB) ;
0fafbd9
+MainFromObjects spotread : spotread$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
0fafbd9
+LinkLibraries spotread : libinst.lib
0fafbd9
+                          ../rspl/librspl.lib ../xicc/libxicc.lib
0fafbd9
+                          ../icc/libicc.lib ../gamut/libgamut.lib ../cgats/libcgats.lib
0fafbd9
+                          ../plot/libplot.lib ../numlib/libnum.lib
0fafbd9
+                          $(LIBUSB)/libusb.lib $(LibWin)
0fafbd9
+                          $(HIDLIBS) ;
0fafbd9
+
0fafbd9
+# Gretag Spectroscan/T filmstrip reader
0fafbd9
+#Object filmread$(SUFOBJ) : filmread.c ;
0fafbd9
+#ObjectHdrs filmread : . ../h ../cgats ../icc ../numlib ../xicc $(LIBUSB) ;
0fafbd9
+#MainFromObjects filmread : filmread$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
0fafbd9
+#LinkLibraries filmread : libinst.lib ../cgats/libcgats.lib ../xicc/libxicc.lib
0fafbd9
+#                          ../rspl/librspl.lib
0fafbd9
+#                          ../numlib/libnum.lib ../icc/libicc ../plot/libplot.lib
0fafbd9
+#                          $(LIBUSB)/libusb.lib
0fafbd9
+#                          $(HIDLIBS) ;
0fafbd9
+
0fafbd9
+# Create linear .cal
0fafbd9
+Main displin : displin.c ;
0fafbd9
+ObjectHdrs displin : . ../h ../cgats ../numlib ;
0fafbd9
+LinkLibraries displin : ../cgats/libcgats.lib ../numlib/libnum.lib ;
0fafbd9
+
0fafbd9
+# Display calibration program
0fafbd9
+Object dispcal$(SUFOBJ) : dispcal.c ;
0fafbd9
+ObjectHdrs dispcal dispwin dispsup ../target/ofps : . ../h ../cgats ../icc
0fafbd9
+                           ../numlib ../rspl ../spectro ../xicc ../spectro ../gamut
0fafbd9
+                           ../target ../plot $(LIBUSB) $(LibWinH) ;
0fafbd9
+MainFromObjects dispcal : dispcal$(SUFOBJ) dispwin$(SUFOBJ) ../target/ofps$(SUFOBJ)
0fafbd9
+                          dispsup$(SUFOBJ) ;
0fafbd9
+LinkLibraries dispcal : libinst.lib ../cgats/libcgats.lib
0fafbd9
+                          ../rspl/librspl.lib
0fafbd9
+                          ../xicc/libxicc.lib  ../icc/libicc.lib
0fafbd9
+                          ../rspl/librspl.lib ../numlib/libnum.lib  
0fafbd9
+                          ../gamut/libgamut.lib ../plot/libplot.lib 
0fafbd9
+                          $(LIBUSB)/libusb.lib $(LibWin)
0fafbd9
+                          $(HIDLIBS) ;
0fafbd9
+
0fafbd9
+# Display tester program
0fafbd9
+Main dispread : dispread.c dispwin.c dispsup.c ;
0fafbd9
+ObjectHdrs dispread dispwin dispsup : . ../h ../cgats ../icc ../numlib ../xicc $(LIBUSB) $(LibWinH) ;
0fafbd9
+LinkLibraries dispread : libinst.lib ../cgats/libcgats.lib
0fafbd9
+                          ../rspl/librspl.lib
0fafbd9
+                          ../xicc/libxicc.lib  ../icc/libicc.lib
0fafbd9
+                          ../numlib/libnum.lib ../plot/libplot.lib
0fafbd9
+                          $(LIBUSB)/libusb.lib $(LibWin)
0fafbd9
+                          $(HIDLIBS) ;
0fafbd9
+
0fafbd9
+
0fafbd9
+# ~~~999
0fafbd9
+#display test window test/Lut loader utility
0fafbd9
+Object sa_dispwin$(SUFOBJ) : dispwin.c ;
0fafbd9
+ObjectHdrs sa_dispwin : . ../h ../numlib ../cgats ../icc $(LibWinH) ;
0fafbd9
+MainFromObjects dispwin : sa_dispwin$(SUFOBJ) ;
0fafbd9
+ObjectCcFlags sa_dispwin.c : -DSTANDALONE_TEST ;
0fafbd9
+LinkLibraries dispwin : libinst.lib ../cgats/libcgats.lib
0fafbd9
+                         ../xicc/libxicc.lib  ../icc/libicc.lib
0fafbd9
+                         ../numlib/libnum.lib ../plot/libplot.lib
0fafbd9
+                         $(LIBUSB)/libusb.lib $(LibWin)
0fafbd9
+                         $(HIDLIBS) ;
0fafbd9
+
0fafbd9
+# Fake device print/read utility using ICC profile
0fafbd9
+Main fakeread : fakeread.c ;
0fafbd9
+ObjectHdrs fakeread : . ../h ../cgats ../xicc ../spectro ../rspl ../numlib ../gamut ../plot ../icc ;	
0fafbd9
+LinkLibraries fakeread : libinsttypes.lib ../icc/libicc.lib
0fafbd9
+                        ../xicc/libxicc.lib ../xicc/libxcolorants.lib
0fafbd9
+						../gamut/libgamut.lib ../cgats/libcgats.lib
0fafbd9
+                        ../rspl/librspl.lib ../numlib/libnum.lib
0fafbd9
+                        ../plot/libplot.lib
0fafbd9
+                        $(LIBUSB)/libusb.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Synthetic device print/read utility
0fafbd9
+Main synthread : synthread.c ;
0fafbd9
+ObjectHdrs synthread : . ../h ../cgats ../xicc ../spectro ../rspl ../numlib ../gamut ../plot ../icc ;	
0fafbd9
+LinkLibraries synthread : libinsttypes.lib ../icc/libicc.lib
0fafbd9
+                        ../xicc/libxicc.lib ../xicc/libxcolorants.lib
0fafbd9
+						../gamut/libgamut.lib ../cgats/libcgats.lib
0fafbd9
+                        ../rspl/librspl.lib ../numlib/libnum.lib
0fafbd9
+                        ../plot/libplot.lib
0fafbd9
+                        $(LIBUSB)/libusb.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Add CIE values to a spectral reading file
0fafbd9
+Main spec2cie : spec2cie.c ;
0fafbd9
+ObjectHdrs spec2cie : . ../h ../cgats ../xicc ../spectro ../rspl ../numlib ../gamut ../icc ../plot  $(LIBUSB) ;	
0fafbd9
+LinkLibraries spec2cie : libinsttypes.lib ../icc/libicc.lib
0fafbd9
+                        ../xicc/libxicc.lib ../xicc/libxcolorants.lib
0fafbd9
+						../gamut/libgamut.lib ../numlib/libnum.lib
0fafbd9
+                        ../cgats/libcgats.lib ../plot/libplot.lib 
0fafbd9
+                        $(LIBUSB)/libusb.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Utility to enable the Spyder 2 instrument */
0fafbd9
+Main spyd2en : spyd2en.c vinflate.c ;
0fafbd9
+ObjectHdrs spyd2en vinflate : . ../h ../numlib ;	
0fafbd9
+LinkLibraries spyd2en : ../numlib/libnum.lib ;
0fafbd9
+
0fafbd9
+# Dumy ti3 file generator for testing
0fafbd9
+#Main dumyti3 : dumyti3.c ;
0fafbd9
+#ObjectHdrs dumyti3 : . ../h ../cgats ;
0fafbd9
+#LinkLibraries dumyti3 : ../cgats/libcgats.lib ;
0fafbd9
+
0fafbd9
+# Test utility for XYZ matrix spectral correction
0fafbd9
+#Main xyzfix : xyzfix.c ;
0fafbd9
+#ObjectHdrs xyzfix : . ../h ../numlib ../icc ../cgats ;
0fafbd9
+#LinkLibraries xyzfix : ../numlib/libnum.lib ../icc/libicc.lib ../cgats/libcgats.lib ;
0fafbd9
+
0fafbd9
+# Experimental RAMDAC loader
0fafbd9
+# Main vgamma : vgamma.c ;
0fafbd9
+
0fafbd9
+# fp conversion code test
0fafbd9
+#Main fp : fp.c ;
0fafbd9
+
0fafbd9
+# test code
0fafbd9
+#Main tt : tt.c 
0fafbd9
+#ObjectHdrs tt : . ../numlib ../plot ;
0fafbd9
+#LinkLibraries tt : ../numlib/libnum.lib ../plot/libplot.lib ;
0fafbd9
+
0fafbd9
+if $(OLD_GRETAG) && $(UNIX) && $(OS) != MACOSX {
0fafbd9
+
0fafbd9
+	# test for parsing a VISE archive
0fafbd9
+	Main visetest : visetest.c vinflate.c ;
0fafbd9
+	ObjectHdrs visetest vinflate : . ../h ../numlib ;	
0fafbd9
+	LinkLibraries visetest : ../numlib/libnum.lib ;
0fafbd9
+
0fafbd9
+	# Compute deconvolution filter for i1pro
0fafbd9
+	#Main i1deconv : i1deconv.c ;
0fafbd9
+	#ObjectHdrs i1deconv : . ../numlib ../rspl ../plot ;
0fafbd9
+	#LinkLibraries i1deconv : ../numlib/libnum.lib ../rspl/librspl.lib ../plot/libplot.lib ;
0fafbd9
+
0fafbd9
+	# Compute stray light calibration for i1pro
0fafbd9
+	#Main i1stray : i1stray.c ;
0fafbd9
+	#ObjectHdrs i1stray : . ../numlib ../rspl ../plot ../icc ../xicc ;
0fafbd9
+	#LinkLibraries i1stray : ../numlib/libnum.lib ../rspl/librspl.lib ../plot/libplot.lib ;
0fafbd9
+
0fafbd9
+	# test gretag interface
0fafbd9
+	Object gt_gretag$(SUFOBJ) : gretag.c ;
0fafbd9
+	ObjectCcFlags gt_gretag.c : -DSTANDALONE_TEST ;
0fafbd9
+    ObjectHdrs gt_gretag.c : . ../h ../icc ../xicc ;
0fafbd9
+	MainFromObjects gt_test : gt_gretag$(SUFOBJ) spm$(SUFOBJ) $(IOFILE:S=$(SUFOBJ)) ;
0fafbd9
+	LinkLibraries gt_test : libinst.lib ../xicc/libxicc.lib ../cgats/libcgats.lib
0fafbd9
+                            ../icc/libicc.lib $(LIBUSB)/libusb.lib $(LibWin) ;
0fafbd9
+	LINKFLAGS on gt_test += -L$(LibWinD) ;
0fafbd9
+	LINKLIBS on gt_test += -lglut -lGL -lGLU -lX11 -lXext -lXmu -lXi -lm ;
0fafbd9
+}
0fafbd9
+
0fafbd9
diff -uNr argyllcms-0.70.orig/spectro/Jamfile.rej argyllcms-0.70/spectro/Jamfile.rej
0fafbd9
--- argyllcms-0.70.orig/spectro/Jamfile.rej	1970-01-01 01:00:00.000000000 +0100
0fafbd9
+++ argyllcms-0.70/spectro/Jamfile.rej	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -0,0 +1,42 @@
0fafbd9
+***************
0fafbd9
+*** 37,43 ****
0fafbd9
+  
0fafbd9
+  #Products
0fafbd9
+  Libraries = libinsttypes libinst ;
0fafbd9
+- Executables = dispwin displin dispread dispcal fakeread synthread filmread printread spotread spec2cie spyd2en ;
0fafbd9
+  Headers = inst.h ;
0fafbd9
+  Samples = ColorChecker.ti2 ECI2002R.ti2 FograStrip.ti2 i1_RGB_Scan_1.4.ti2 SOtele.sp ;
0fafbd9
+  
0fafbd9
+--- 37,43 ----
0fafbd9
+  
0fafbd9
+  #Products
0fafbd9
+  Libraries = libinsttypes libinst ;
0fafbd9
++ Executables = dispwin displin dispread dispcal fakeread synthread printread spotread spec2cie spyd2en ;
0fafbd9
+  Headers = inst.h ;
0fafbd9
+  Samples = ColorChecker.ti2 ECI2002R.ti2 FograStrip.ti2 i1_RGB_Scan_1.4.ti2 SOtele.sp ;
0fafbd9
+  
0fafbd9
+***************
0fafbd9
+*** 84,99 ****
0fafbd9
+                            $(LIBUSB)/libusb.lib $(LibWin)
0fafbd9
+                            $(HIDLIBS) ;
0fafbd9
+  
0fafbd9
+- # Gretag Spectroscan/T filmstrip reader
0fafbd9
+- Object filmread$(SUFOBJ) : filmread.c ;
0fafbd9
+- ObjectHdrs filmread : . ../h ../cgats ../icc ../numlib ../xicc $(LIBUSB) ;
0fafbd9
+- MainFromObjects filmread : filmread$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
0fafbd9
+- LinkLibraries filmread : libinst.lib ../cgats/libcgats.lib ../xicc/libxicc.lib
0fafbd9
+-                           ../rspl/librspl.lib
0fafbd9
+-                           ../numlib/libnum.lib ../icc/libicc ../plot/libplot.lib
0fafbd9
+-                           $(LIBUSB)/libusb.lib
0fafbd9
+-                           $(HIDLIBS) ;
0fafbd9
+- 
0fafbd9
+  # Create linear .cal
0fafbd9
+  Main displin : displin.c ;
0fafbd9
+  ObjectHdrs displin : . ../h ../cgats ../numlib ;
0fafbd9
+--- 84,89 ----
0fafbd9
+                            $(LIBUSB)/libusb.lib $(LibWin)
0fafbd9
+                            $(HIDLIBS) ;
0fafbd9
+  
0fafbd9
+  # Create linear .cal
0fafbd9
+  Main displin : displin.c ;
0fafbd9
+  ObjectHdrs displin : . ../h ../cgats ../numlib ;
0fafbd9
diff -uNr argyllcms-0.70.orig/target/Jamfile argyllcms-0.70/target/Jamfile
0fafbd9
--- argyllcms-0.70.orig/target/Jamfile	2008-01-16 02:47:45.000000000 +0100
0fafbd9
+++ argyllcms-0.70/target/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -14,9 +14,9 @@
0fafbd9
 	LINKFLAGS += -framework IOKit ;
0fafbd9
 	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
   } else {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include/X11 ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD = ;
0fafbd9
 	LibWin = ;
0fafbd9
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
   }
0fafbd9
diff -uNr argyllcms-0.70.orig/target/Jamfile.orig argyllcms-0.70/target/Jamfile.orig
0fafbd9
--- argyllcms-0.70.orig/target/Jamfile.orig	1970-01-01 01:00:00.000000000 +0100
0fafbd9
+++ argyllcms-0.70/target/Jamfile.orig	2008-01-16 02:47:45.000000000 +0100
0fafbd9
@@ -0,0 +1,138 @@
0fafbd9
+# Print Calibration Target Data File generator
0fafbd9
+
0fafbd9
+#SubDir TOP target ;
0fafbd9
+
0fafbd9
+CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
0fafbd9
+#CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
0fafbd9
+#CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
0fafbd9
+#LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
0fafbd9
+#CCFLAGS     += $(CCHEAPDEBUG) ;     # Heap Debugging flags
0fafbd9
+LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
0fafbd9
+
0fafbd9
+if $(UNIX) {
0fafbd9
+  if $(OS) = MACOSX {
0fafbd9
+	LINKFLAGS += -framework IOKit ;
0fafbd9
+	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
+  } else {
0fafbd9
+	WinDir = /usr/X11R6 ;
0fafbd9
+	LibWinH = $(WinDir)/include/X11 ;
0fafbd9
+	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWin = ;
0fafbd9
+	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
+  }
0fafbd9
+}
0fafbd9
+
0fafbd9
+if $(HAVE_TIFF) {
0fafbd9
+	TIFFLIB = ;
0fafbd9
+	TIFFINC = ;
0fafbd9
+	LINKLIBS on targen$(SUFEXE)
0fafbd9
+				filmtarg$(SUFEXE) = -ltiff $(LINKLIBS) ;
0fafbd9
+} else {
0fafbd9
+	TIFFLIB = ../tiff/libtiff.lib ;
0fafbd9
+	TIFFINC = ../tiff ;
0fafbd9
+}
0fafbd9
+
0fafbd9
+#Products
0fafbd9
+Executables = targen printtarg ;
0fafbd9
+
0fafbd9
+#Install
0fafbd9
+InstallBin $(DOTDOT)$(SLASH)bin : $(Executables)$(SUFEXE) ;
0fafbd9
+
0fafbd9
+Object alphix$(SUFOBJ) : alphix.c ;
0fafbd9
+ObjectHdrs alphix$(SUFOBJ) : ../h ../numlib ;
0fafbd9
+
0fafbd9
+Object randix$(SUFOBJ) : randix.c ;
0fafbd9
+ObjectHdrs randix$(SUFOBJ) : ../h ../numlib ;
0fafbd9
+
0fafbd9
+#target generator
0fafbd9
+Main targen : targen.c ppoint.c ofps.c ifarp.c simplat.c simdlat.c prand.c ;
0fafbd9
+ObjectHdrs ppoint$(SUFOBJ) : ../h ../numlib ../plot ../icc ../rspl ../xicc ; 
0fafbd9
+ObjectHdrs ofps$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ; 
0fafbd9
+ObjectHdrs ifarp$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
0fafbd9
+ObjectHdrs simplat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
0fafbd9
+ObjectHdrs simdlat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
0fafbd9
+ObjectHdrs prand$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
0fafbd9
+ObjectHdrs targen$(SUFOBJ) : ../h ../numlib ../rspl ../cgats ../icc ../gamut ../xicc ../spectro ;
0fafbd9
+LinkLibraries targen : ../rspl/librspl.lib ../cgats/libcgats.lib
0fafbd9
+                       ../icc/libicc.lib ../plot/libplot.lib ../xicc/libxicc.lib
0fafbd9
+                       ../xicc/libxcolorants.lib ../gamut/libgamut.lib
0fafbd9
+                       ../numlib/libnum.lib ../spectro/libinsttypes.lib 
0fafbd9
+                       $(LibWin) ;
0fafbd9
+
0fafbd9
+# Film Calibration Target File generator
0fafbd9
+#MainFromObjects filmtarg : filmtarg$(SUFOBJ) alphix$(SUFOBJ) randix$(SUFOBJ) ;
0fafbd9
+#Object filmtarg$(SUFOBJ) : filmtarg.c ;
0fafbd9
+#ObjectHdrs filmtarg$(SUFOBJ) : ../h ../numlib ../cgats $(TIFFINC) ;
0fafbd9
+#LinkLibraries filmtarg : ../cgats/libcgats.lib $(TIFFLIB) ;
0fafbd9
+
0fafbd9
+# Print Calibration Target Postscrip../numlib t File generator
0fafbd9
+MainFromObjects printtarg : printtarg$(SUFOBJ) alphix$(SUFOBJ) randix$(SUFOBJ) ;
0fafbd9
+Object printtarg$(SUFOBJ) : printtarg.c ;
0fafbd9
+ObjectHdrs printtarg$(SUFOBJ) : ../h ../numlib ../cgats ../spectro ../rspl ../icc ../xicc
0fafbd9
+                                ../gamut ;
0fafbd9
+LinkLibraries printtarg : ../cgats/libcgats.lib ../xicc/libxicc.lib
0fafbd9
+                          ../xicc/libxcolorants.lib ../icc/libicc.lib
0fafbd9
+                          ../numlib/libnum.lib ../spectro/libinsttypes.lib
0fafbd9
+                          ../plot/libplot.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Individual stand alone test of sample point classes
0fafbd9
+
0fafbd9
+# Percepttual point distribution
0fafbd9
+MainFromObjects ppoint : sa_ppoint$(SUFOBJ) ;
0fafbd9
+Object sa_ppoint$(SUFOBJ) : ppoint.c ;
0fafbd9
+ObjectCcFlags sa_ppoint$(SUFOBJ) : -DSTANDALONE_TEST ;
0fafbd9
+ObjectHdrs sa_ppoint$(SUFOBJ) : ../h ../numlib ../plot ../icc ../rspl ../xicc ; 
0fafbd9
+LinkLibraries ppoint : ../plot/libplot.lib ../rspl/librspl.lib ../numlib/libnum.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Optimised farthest point sampling class
0fafbd9
+MainFromObjects ofps : sa_ofps$(SUFOBJ) ;
0fafbd9
+Object sa_ofps$(SUFOBJ) : ofps.c ;
0fafbd9
+ObjectCcFlags sa_ofps$(SUFOBJ) : -DSTANDALONE_TEST ;
0fafbd9
+ObjectHdrs sa_ofps$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ; 
0fafbd9
+LinkLibraries ofps : ../numlib/libnum.lib ../plot/libplot.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Incremental far point class
0fafbd9
+MainFromObjects ifarp : sa_ifarp$(SUFOBJ) ;
0fafbd9
+Object sa_ifarp$(SUFOBJ) : ifarp.c ;
0fafbd9
+ObjectCcFlags sa_ifarp$(SUFOBJ) : -DSTANDALONE_TEST ;
0fafbd9
+ObjectHdrs sa_ifarp$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ; 
0fafbd9
+LinkLibraries ifarp : ../numlib/libnum.lib ../plot/libplot.lib
0fafbd9
+                        ../xicc/libxcolorants.lib ../icc/libicc.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Perceptual space simplex lattice
0fafbd9
+MainFromObjects simplat : sa_simplat$(SUFOBJ) ;
0fafbd9
+Object sa_simplat$(SUFOBJ) : simplat.c ;
0fafbd9
+ObjectCcFlags sa_simplat$(SUFOBJ) : -DSTANDALONE_TEST ;
0fafbd9
+ObjectHdrs sa_simplat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ; 
0fafbd9
+LinkLibraries simplat : ../numlib/libnum.lib ../plot/libplot.lib
0fafbd9
+                        ../xicc/libxcolorants.lib ../icc/libicc.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+# Device space simplex lattice
0fafbd9
+MainFromObjects simdlat : sa_simdlat$(SUFOBJ) ;
0fafbd9
+Object sa_simdlat$(SUFOBJ) : simdlat.c ;
0fafbd9
+ObjectCcFlags sa_simdlat$(SUFOBJ) : -DSTANDALONE_TEST ;
0fafbd9
+ObjectHdrs sa_simdlat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ; 
0fafbd9
+LinkLibraries simdlat : ../numlib/libnum.lib ../plot/libplot.lib
0fafbd9
+                        ../xicc/libxcolorants.lib ../icc/libicc.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+if $(BUILD_JUNK) {
0fafbd9
+
0fafbd9
+	# Test program
0fafbd9
+	MainFromObjects test : test$(SUFOBJ) alphix$(SUFOBJ) ;
0fafbd9
+	Object test$(SUFOBJ) : test.c ;
0fafbd9
+	ObjectHdrs test$(SUFOBJ) : ../h ../numlib ; 
0fafbd9
+	LinkLibraries test : ../numlib/libnum.lib ;
0fafbd9
+
0fafbd9
+	# Test program
0fafbd9
+	MainFromObjects temp : temp$(SUFOBJ) ;
0fafbd9
+	Object temp$(SUFOBJ) : temp.c ;
0fafbd9
+	ObjectHdrs temp$(SUFOBJ) : ../h ../numlib ../plot ; 
0fafbd9
+	LinkLibraries temp : ../numlib/libnum.lib ../plot/libplot.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+	# Test lmean experiment
0fafbd9
+	MainFromObjects lmean : lmean$(SUFOBJ) ;
0fafbd9
+	Object lmean$(SUFOBJ) : lmean.c ;
0fafbd9
+	ObjectHdrs lmean$(SUFOBJ) : ../h ../numlib ../plot ; 
0fafbd9
+	LinkLibraries lmean : ../numlib/libnum.lib ../plot/libplot.lib $(LibWin) ;
0fafbd9
+
0fafbd9
+}
0fafbd9
diff -uNr argyllcms-0.70.orig/xicc/Jamfile argyllcms-0.70/xicc/Jamfile
0fafbd9
--- argyllcms-0.70.orig/xicc/Jamfile	2008-01-16 02:47:40.000000000 +0100
0fafbd9
+++ argyllcms-0.70/xicc/Jamfile	2008-02-07 20:51:37.000000000 +0100
0fafbd9
@@ -12,9 +12,9 @@
0fafbd9
 	LINKFLAGS += -framework IOKit ;
0fafbd9
 	LINKFLAGS += -framework CoreFoundation ;
0fafbd9
   } else {
0fafbd9
-	WinDir = /usr/X11R6 ;
0fafbd9
+	WinDir = /usr ;
0fafbd9
 	LibWinH = $(WinDir)/include/X11 ;
0fafbd9
-	LibWinD = $(WinDir)/lib ;
0fafbd9
+	LibWinD = ;
0fafbd9
 	LibWin = ;
0fafbd9
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
0fafbd9
   }
0fafbd9
@@ -23,7 +23,9 @@
0fafbd9
 if $(HAVE_TIFF) {	# Alternate TIFF library
0fafbd9
 	TIFFLIB = ;
0fafbd9
 	TIFFINC = ;
0fafbd9
-	LINKLIBS on tiffgamut$(SUFEXE) = $(LINKLIBS) -ltiff ;
0fafbd9
+	LINKLIBS on tiffgamut$(SUFEXE)
0fafbd9
+	            cam02plot$(SUFEXE) = $(LINKLIBS) -ltiff ;
0fafbd9
+
0fafbd9
 } else {
0fafbd9
 	TIFFLIB = ../tiff/libtiff.lib ;
0fafbd9
 	TIFFINC = ../tiff ;