[patch] ccolamd-2.7.0-autotools.patch

ccolamd-2.7.0-autotools.patch (text/plain), 7.15 KB, created by Justin Bronder (RETIRED) on 2007-09-20 16:35:09 UTC

diff -urN CCOLAMD_orig/Demo/Makefile CCOLAMD/Demo/Makefile
--- CCOLAMD_orig/Demo/Makefile	2007-05-05 09:58:32.000000000 -0400
+++ CCOLAMD/Demo/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,43 +0,0 @@
-#-----------------------------------------------------------------------------
-# compile the CCOLAMD demo
-#-----------------------------------------------------------------------------
-
-default: ccolamd_example ccolamd_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:
-
-ccolamd_example: ccolamd_example.c library
-	$(C) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.a -lm
-	- ./ccolamd_example > my_ccolamd_example.out
-	- diff ccolamd_example.out my_ccolamd_example.out
-
-ccolamd_l_example: ccolamd_l_example.c library
-	$(C) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.a -lm
-	- ./ccolamd_l_example > my_ccolamd_l_example.out
-	- diff ccolamd_example.out my_ccolamd_example.out
-
-#------------------------------------------------------------------------------
-# Remove all but the files in the original distribution
-#------------------------------------------------------------------------------
-
-clean:
-	- $(RM) $(CLEAN)
-
-purge: distclean
-
-distclean: clean
-	- $(RM) ccolamd_example ccolamd_l_example
-	- $(RM) my_ccolamd_example.out my_ccolamd_l_example.out
diff -urN CCOLAMD_orig/Demo/Makefile.am CCOLAMD/Demo/Makefile.am
--- CCOLAMD_orig/Demo/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ CCOLAMD/Demo/Makefile.am	2007-09-20 11:18:25.000000000 -0400
@@ -0,0 +1,24 @@
+AM_CPPFLAGS = -I$(top_srcdir)/Include
+AM_LDFLAGS = -lm
+check_PROGRAMS = \
+	ccolamd_example \
+	ccolamd_l_example
+
+ccolamd_example_SOURCES = ccolamd_example.c
+ccolamd_example_LDADD = $(top_builddir)/Lib/libccolamd.la
+
+ccolamd_l_example_SOURCES = ccolamd_l_example.c
+ccolamd_l_example_LDADD = $(top_builddir)/Lib/libccolamd.la
+
+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 "Test $$i failed!"; \
+			exit 1; \
+		fi \
+	done;
+
+clean-local:
+	rm -f my*.out
diff -urN CCOLAMD_orig/Lib/Makefile CCOLAMD/Lib/Makefile
--- CCOLAMD_orig/Lib/Makefile	2007-05-05 09:59:13.000000000 -0400
+++ CCOLAMD/Lib/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-#-------------------------------------------------------------------------------
-# CCOLAMD Makefile
-#-------------------------------------------------------------------------------
-
-default: libccolamd.a
-
-include ../../UFconfig/UFconfig.mk
-
-I = -I../Include -I../../UFconfig
-
-INC = ../Include/ccolamd.h ../../UFconfig/UFconfig.h
-
-SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c
-
-# creates libccolamd.a, a C-callable COLAMD library
-libccolamd.a:  $(SRC) $(INC)
-	$(CC) $(CFLAGS) $(I) -c ../Source/ccolamd_global.c
-	$(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c
-	$(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o
-	$(AR) libccolamd.a ccolamd.o ccolamd_l.o ccolamd_global.o
-
-ccode: libccolamd.a
-
-library: libccolamd.a
-
-clean:
-	- $(RM) $(CLEAN)
-
-purge: distclean
-
-distclean: clean
-	- $(RM) libccolamd.a
diff -urN CCOLAMD_orig/Lib/Makefile.am CCOLAMD/Lib/Makefile.am
--- CCOLAMD_orig/Lib/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ CCOLAMD/Lib/Makefile.am	2007-09-20 11:18:25.000000000 -0400
@@ -0,0 +1,11 @@
+AM_CPPFLAGS = -I$(top_builddir)/Include
+lib_LTLIBRARIES = libccolamd.la
+noinst_LTLIBRARIES = libccolamdl.la libccolamdi.la
+
+libccolamd_la_SOURCES = $(top_srcdir)/Source/ccolamd_global.c
+libccolamd_la_LIBADD = libccolamdl.la libccolamdi.la
+
+libccolamdl_la_SOURCES = $(top_srcdir)/Source/ccolamd.c
+libccolamdl_la_CFLAGS = -DDLONG
+
+libccolamdi_la_SOURCES = $(top_srcdir)/Source/ccolamd.c
diff -urN CCOLAMD_orig/MATLAB/Makefile CCOLAMD/MATLAB/Makefile
--- CCOLAMD_orig/MATLAB/Makefile	2007-05-05 22:41:08.000000000 -0400
+++ CCOLAMD/MATLAB/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-# CCOLAMD Makefile for MATLAB mexFunctions
-
-default: ccolamd2 csymamd2
-
-include ../../UFconfig/UFconfig.mk
-
-I = -I../../UFconfig -I../Include
-
-INC = ../Include/ccolamd.h ../../UFconfig/UFconfig.h
-
-SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c
-
-MX = $(MEX) -DDLONG $(I)
-
-# Compiles the MATLAB-callable routines
-mex: ccolamd2 csymamd2
-
-csymamd2: csymamdmex.c $(INC) $(SRC)
-	$(MX) -output csymamd csymamdmex.c $(SRC)
-
-ccolamd2: ccolamdmex.c $(INC) $(SRC)
-	$(MX) -output ccolamd ccolamdmex.c $(SRC)
-
-# Compiles the extensive test code
-test: mex ccolamdtestmex.c csymamdtestmex.c $(INC) $(SRC)
-	$(MX) ccolamdtestmex.c $(SRC)
-	$(MX) csymamdtestmex.c $(SRC)
-
-clean:
-	- $(RM) $(CLEAN)
-
-purge: distclean
-
-distclean: clean
-	- $(RM) *.mex* *.dll
diff -urN CCOLAMD_orig/Makefile CCOLAMD/Makefile
--- CCOLAMD_orig/Makefile	2007-05-05 09:57:17.000000000 -0400
+++ CCOLAMD/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,49 +0,0 @@
-#------------------------------------------------------------------------------
-# CCOLAMD 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 CCOLAMD_orig/Makefile.am CCOLAMD/Makefile.am
--- CCOLAMD_orig/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ CCOLAMD/Makefile.am	2007-09-20 11:18:25.000000000 -0400
@@ -0,0 +1,3 @@
+EXTRA_DIST = Doc/ChangeLog README.txt
+include_HEADERS = Include/ccolamd.h
+SUBDIRS = Demo/ Lib/
diff -urN CCOLAMD_orig/configure.ac CCOLAMD/configure.ac
--- CCOLAMD_orig/configure.ac	1969-12-31 19:00:00.000000000 -0500
+++ CCOLAMD/configure.ac	2007-09-20 11:19:32.000000000 -0400
@@ -0,0 +1,14 @@
+#                                               -*- Autoconf -*-
+AC_PREREQ(2.59)
+AC_INIT(ccolamd, 2.7.0, [e-mail])
+AM_INIT_AUTOMAKE([foreign])
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_CHECK_LIB(m, sqrt)
+AC_CHECK_HEADERS(UFconfig.h)
+AC_CONFIG_FILES([
+    Lib/Makefile
+    Demo/Makefile
+    Makefile])
+AC_OUTPUT
+