--- /dev/null
+--- src/x11/Makefile.am~ 2005-01-13 17:12:35.000000000 +0000
++++ src/x11/Makefile.am 2005-06-08 15:09:32.840822480 +0000
+@@ -10,7 +10,7 @@
+ JPEGLIB = @top_builddir@/libs/libjpeg6b/libjpeg.a
+ endif
+
+-INCLUDES=-I@top_srcdir@/libs/libFreeMat -I@top_srcdir@/libs/libCore -I@top_srcdir@/libs/libFN -I@top_srcdir@/libs/libGraphics -I@top_builddir@/libs/libffi/include -I@top_srcdir@/libs/libXP -I@top_srcdir@/libs/libFLTK
++INCLUDES=-I@top_srcdir@/libs/libFreeMat -I@top_srcdir@/libs/libCore -I@top_srcdir@/libs/libFN -I@top_srcdir@/libs/libGraphics -I@top_srcdir@/libs/libXP -I@top_srcdir@/libs/libFLTK
+
+ bin_PROGRAMS = FreeMat
+
+@@ -20,5 +20,5 @@
+ Terminal.cpp \
+ Terminal.hpp
+
+-FreeMat_DEPENDENCIES = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libffi/libffi.a @top_builddir@/libs/libXP/libXP.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @top_builddir@/libs/libFLTK/libFLTK.a
+-FreeMat_LDADD = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libffi/libffi.a @top_builddir@/libs/libXP/libXP.a @top_builddir@/libs/libFLTK/libFLTK.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ -L/sw/lib -lg2c
++FreeMat_DEPENDENCIES = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libXP/libXP.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @top_builddir@/libs/libFLTK/libFLTK.a
++FreeMat_LDADD = @top_builddir@/libs/libCore/libCore.a @top_builddir@/libs/libFN/libFN.a @top_builddir@/libs/libGraphics/libGraphics.a @top_builddir@/libs/libFreeMat/libFreeMat.a @top_builddir@/libs/libARPACK/libARPACK.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a @top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a @top_builddir@/libs/libUMFPACK/AMD/libAMD.a @top_builddir@/libs/libFFTPack/libFFTPack.a @top_builddir@/libs/libXP/libXP.a @top_builddir@/libs/libFLTK/libFLTK.a $(PNGLIB) $(TIFFLIB) $(JPEGLIB) @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ -L/sw/lib -lg2c -lffi
+--- libs/Makefile.am~ 2004-12-07 20:13:47.000000000 +0000
++++ libs/Makefile.am 2005-06-08 15:10:56.993029400 +0000
+@@ -15,7 +15,7 @@
+ endif
+
+ SUBDIRS = libFreeMat libFFTPack libCore libGraphics libXP \
+- $(BLAS_DIR) libMiniLAPACK libffi libf2c $(JPEG_DIR) \
++ $(BLAS_DIR) libMiniLAPACK libf2c $(JPEG_DIR) \
+ $(TIFF_DIR) $(PNG_DIR) libFN libFLTK libUMFPACK libARPACK
+
+ AUTOMAKE_OPTIONS = foreign