diff -urN COLAMD_orig/Demo/Makefile COLAMD/Demo/Makefile --- COLAMD_orig/Demo/Makefile 2007-05-05 09:42:44.000000000 -0400 +++ COLAMD/Demo/Makefile 1969-12-31 19:00:00.000000000 -0500 @@ -1,43 +0,0 @@ -#----------------------------------------------------------------------------- -# compile the COLAMD demo -#----------------------------------------------------------------------------- - -default: colamd_example colamd_l_example - -include ../../UFconfig/UFconfig.mk - -I = -I../Include -I../../UFconfig - -C = $(CC) $(CFLAGS) $(I) - -library: - ( cd ../Lib ; $(MAKE) ) - -#------------------------------------------------------------------------------ -# Create the demo program, run it, and compare the output -#------------------------------------------------------------------------------ - -dist: - -colamd_example: colamd_example.c library - $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a -lm - - ./colamd_example > my_colamd_example.out - - diff colamd_example.out my_colamd_example.out - -colamd_l_example: colamd_l_example.c library - $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a -lm - - ./colamd_l_example > my_colamd_l_example.out - - diff colamd_example.out my_colamd_example.out - -#------------------------------------------------------------------------------ -# Remove all but the files in the original distribution -#------------------------------------------------------------------------------ - -clean: - - $(RM) $(CLEAN) - -purge: distclean - -distclean: clean - - $(RM) colamd_example colamd_l_example - - $(RM) my_colamd_example.out my_colamd_l_example.out diff -urN COLAMD_orig/Demo/Makefile.am COLAMD/Demo/Makefile.am --- COLAMD_orig/Demo/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ COLAMD/Demo/Makefile.am 2007-09-20 12:20:41.000000000 -0400 @@ -0,0 +1,23 @@ +LDADD = $(top_builddir)/Lib/libcolamd.la +AM_CFLAGS = -I$(top_srcdir)/Include + +check_PROGRAMS = colamd_example colamd_l_example +colamd_example_SOURCES = colamd_example.c +colamd_example_LDADD = $(LDADD) +colamd_l_example_SOURCES = colamd_l_example.c +colamd_l_example_CPPFLAGS = -DDLONG +colamd_l_example_LDADD = $(LDADD) + + +test: $(check_PROGRAMS) + @for i in $(check_PROGRAMS); do \ + echo "Testing $$i"; \ + ./$$i > my_$$i.out; \ + if ! diff $$i.out my_$$i.out; then \ + echo "Testing $$i failed"; \ + exit 1; \ + fi \ + done; + +clean-local: + rm -f my*.out diff -urN COLAMD_orig/Lib/Makefile COLAMD/Lib/Makefile --- COLAMD_orig/Lib/Makefile 2007-05-05 09:41:47.000000000 -0400 +++ COLAMD/Lib/Makefile 1969-12-31 19:00:00.000000000 -0500 @@ -1,32 +0,0 @@ -#------------------------------------------------------------------------------- -# COLAMD Makefile -#------------------------------------------------------------------------------- - -default: libcolamd.a - -include ../../UFconfig/UFconfig.mk - -I = -I../Include -I../../UFconfig - -INC = ../Include/colamd.h ../../UFconfig/UFconfig.h - -SRC = ../Source/colamd.c ../Source/colamd_global.c - -# creates libcolamd.a, a C-callable COLAMD library -libcolamd.a: $(SRC) $(INC) - $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c - $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c - $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o - $(AR) libcolamd.a colamd.o colamd_l.o colamd_global.o - -ccode: libcolamd.a - -library: libcolamd.a - -clean: - - $(RM) $(CLEAN) - -purge: distclean - -distclean: clean - - $(RM) libcolamd.a diff -urN COLAMD_orig/Lib/Makefile.am COLAMD/Lib/Makefile.am --- COLAMD_orig/Lib/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ COLAMD/Lib/Makefile.am 2007-09-20 12:20:41.000000000 -0400 @@ -0,0 +1,11 @@ +AM_CFLAGS = -I$(top_builddir)/Include +lib_LTLIBRARIES = libcolamd.la +noinst_LTLIBRARIES = libcolamdi.la libcolamdl.la + +libcolamdl_la_SOURCES = $(top_srcdir)/Source/colamd.c +libcolamdl_la_CPPFLAGS = -DDLONG + +libcolamdi_la_SOURCES = $(top_srcdir)/Source/colamd.c + +libcolamd_la_SOURCES = $(top_srcdir)/Source/colamd_global.c +libcolamd_la_LIBADD = libcolamdi.la libcolamdl.la diff -urN COLAMD_orig/MATLAB/Makefile COLAMD/MATLAB/Makefile --- COLAMD_orig/MATLAB/Makefile 2007-05-05 22:41:53.000000000 -0400 +++ COLAMD/MATLAB/Makefile 1969-12-31 19:00:00.000000000 -0500 @@ -1,35 +0,0 @@ -# COLAMD Makefile for MATLAB mexFunctions - -default: colamd2 symamd2 - -include ../../UFconfig/UFconfig.mk - -I = -I../../UFconfig -I../Include - -INC = ../Include/colamd.h ../../UFconfig/UFconfig.h - -SRC = ../Source/colamd.c ../Source/colamd_global.c - -MX = $(MEX) -DDLONG $(I) - -# Compiles the MATLAB-callable routines -mex: colamd2 symamd2 - -symamd2: symamdmex.c $(INC) $(SRC) - $(MX) -output symamd2mex symamdmex.c $(SRC) - -colamd2: colamdmex.c $(INC) $(SRC) - $(MX) -output colamd2mex colamdmex.c $(SRC) - -# Compiles the extensive test code -test: mex colamdtestmex.c symamdtestmex.c $(INC) $(SRC) - $(MX) colamdtestmex.c $(SRC) - $(MX) symamdtestmex.c $(SRC) - -clean: - - $(RM) $(CLEAN) - -purge: distclean - -distclean: clean - - $(RM) *.mex* *.dll diff -urN COLAMD_orig/Makefile COLAMD/Makefile --- COLAMD_orig/Makefile 2007-05-05 09:40:14.000000000 -0400 +++ COLAMD/Makefile 1969-12-31 19:00:00.000000000 -0500 @@ -1,49 +0,0 @@ -#------------------------------------------------------------------------------ -# COLAMD Makefile -#------------------------------------------------------------------------------ - -default: demo - -include ../UFconfig/UFconfig.mk - -# Compile all C code, including the C-callable routine and the mexFunctions. -# Do not the MATLAB interface. -demo: - ( cd Lib ; $(MAKE) ) - ( cd Demo ; $(MAKE) ) - -# Compile all C code, including the C-callable routine and the mexFunctions. -all: - ( cd Lib ; $(MAKE) ) - ( cd Demo ; $(MAKE) ) - ( cd MATLAB ; $(MAKE) ) - -# compile just the C-callable libraries (not mexFunctions or Demos) -library: - ( cd Lib ; $(MAKE) ) - -# remove object files, but keep the compiled programs and library archives -clean: - ( cd Lib ; $(MAKE) clean ) - ( cd Demo ; $(MAKE) clean ) - ( cd MATLAB ; $(MAKE) clean ) - -# clean, and then remove compiled programs and library archives -purge: - ( cd Lib ; $(MAKE) purge ) - ( cd Demo ; $(MAKE) purge ) - ( cd MATLAB ; $(MAKE) purge ) - -distclean: purge - -# get ready for distribution -dist: purge - ( cd Demo ; $(MAKE) dist ) - -ccode: library - -lib: library - -# compile the MATLAB mexFunction -mex: - ( cd MATLAB ; $(MAKE) ) diff -urN COLAMD_orig/Makefile.am COLAMD/Makefile.am --- COLAMD_orig/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ COLAMD/Makefile.am 2007-09-20 12:20:41.000000000 -0400 @@ -0,0 +1,3 @@ +include_HEADERS = $(top_srcdir)/Include/colamd.h +EXTRA_DIST = README.txt +SUBDIRS = Lib/ Demo/ diff -urN COLAMD_orig/configure.ac COLAMD/configure.ac --- COLAMD_orig/configure.ac 1969-12-31 19:00:00.000000000 -0500 +++ COLAMD/configure.ac 2007-09-20 12:21:24.000000000 -0400 @@ -0,0 +1,13 @@ +# -*- Autoconf -*- +AC_PREREQ(2.59) +AC_INIT(colamd, 2.7.0, davis@cise.ufl.edu) +AM_INIT_AUTOMAKE([foreign]) +AC_PROG_INSTALL +AC_PROG_LIBTOOL +AC_CHECK_LIB(m, sqrt) +AC_CHECK_HEADER( UFconfig.h ) +AC_OUTPUT( + Makefile \ + Demo/Makefile \ + Lib/Makefile) +