diff -Nur CAMD.orig/Demo/Makefile.am CAMD/Demo/Makefile.am
--- CAMD.orig/Demo/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ CAMD/Demo/Makefile.am	2007-02-16 18:09:36.000000000 +0000
@@ -0,0 +1,28 @@
+AM_CPPFLAGS = -I$(top_srcdir)/Include
+AM_LDFLAGS = -lm
+check_PROGRAMS = \
+	camd_simple \
+	camd_demo \
+	camd_demo2 \
+	camd_l_demo
+
+camd_demo_SOURCES = amd_demo.c
+camd_demo_LDADD = $(top_builddir)/Source/libcamd.la
+
+camd_l_demo_SOURCES = amd_l_demo.c
+camd_l_demo_LDADD = $(top_builddir)/Source/libcamd.la
+
+camd_demo2_SOURCES = amd_demo2.c
+camd_demo2_LDADD = $(top_builddir)/Source/libcamd.la
+
+camd_simple_SOURCES = amd_simple.c
+camd_simple_LDADD = $(top_builddir)/Source/libcamd.la
+
+check-local:
+	@for i in $(ALL_TEST); do \
+		$$i > my_$$i.out; \
+		- diff $$i.out my_$$i.out; \
+	done;
+
+clean-local:
+	rm -f my*.out
diff -Nur CAMD.orig/Makefile.am CAMD/Makefile.am
--- CAMD.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ CAMD/Makefile.am	2007-02-17 19:42:32.000000000 +0000
@@ -0,0 +1,3 @@
+SUBDIRS = Demo Source
+EXTRA_DIST = README.txt
+include_HEADERS = Include/camd.h Include/camd_internal.h
diff -Nur CAMD.orig/Source/Makefile.am CAMD/Source/Makefile.am
--- CAMD.orig/Source/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ CAMD/Source/Makefile.am	2007-02-19 00:20:25.000000000 +0000
@@ -0,0 +1,14 @@
+CAMDCSRC = camd_aat.c camd_1.c camd_2.c camd_dump.c camd_postorder.c camd_defaults.c \
+	camd_order.c camd_control.c camd_info.c camd_valid.c camd_preprocess.c
+
+lib_LTLIBRARIES = libcamd.la
+noinst_LTLIBRARIES = libcamdi.la libcamdl.la
+AM_CPPFLAGS = -I$(top_srcdir)/Include
+
+libcamdi_la_SOURCES = $(CAMDCSRC)
+libcamdi_la_CPPFLAGS = $(AM_CPPFLAGS) -DDINT
+libcamdl_la_SOURCES = $(CAMDCSRC)
+libcamdl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG
+
+libcamd_la_SOURCES = camd_global.c
+libcamd_la_LIBADD = libcamdl.la libcamdi.la
diff -Nur CAMD.orig/configure.ac CAMD/configure.ac
--- CAMD.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
+++ CAMD/configure.ac	2007-02-18 23:30:10.000000000 +0000
@@ -0,0 +1,11 @@
+#                                               -*- Autoconf -*-
+AC_PREREQ(2.59)
+AC_INIT(camd, 2.1.2, davis@cise.ufl.edu)
+AM_INIT_AUTOMAKE([foreign])
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_CHECK_LIB(m, sqrt)
+AC_CONFIG_FILES([Source/Makefile
+		 Demo/Makefile
+		 Makefile])
+AC_OUTPUT