[patch] camd-2.2.0-autotools.patch

camd-2.2.0-autotools.patch (text/plain), 6.11 KB, created by Justin Bronder (RETIRED) on 2007-09-20 16:34:30 UTC

diff -urN CAMD_orig/Demo/Makefile CAMD/Demo/Makefile
--- CAMD_orig/Demo/Makefile	2007-05-05 10:30:34.000000000 -0400
+++ CAMD/Demo/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-#-----------------------------------------------------------------------------
-# compile the CAMD demo (for both GNU make or original make)
-#-----------------------------------------------------------------------------
-
-default: camd_simple camd_demo camd_demo2 camd_l_demo
-
-include ../../UFconfig/UFconfig.mk
-
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
-
-UFCONFIG = ../../UFconfig/UFconfig.h
-
-INC = ../Include/camd.h $(UFCONFIG)
-
-library:
-	( cd ../Lib ; $(MAKE) )
-
-#------------------------------------------------------------------------------
-# Create the demo program, run it, and compare the output
-#------------------------------------------------------------------------------
-
-dist:
-
-camd_demo: camd_demo.c library $(INC)
-	$(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB)
-	./camd_demo > my_camd_demo.out
-	- diff camd_demo.out my_camd_demo.out
-
-camd_l_demo: camd_l_demo.c library $(INC)
-	$(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB)
-	./camd_l_demo > my_camd_l_demo.out
-	- diff camd_l_demo.out my_camd_l_demo.out
-
-camd_demo2: camd_demo2.c library $(INC)
-	$(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB)
-	./camd_demo2 > my_camd_demo2.out
-	- diff camd_demo2.out my_camd_demo2.out
-
-camd_simple: camd_simple.c library $(INC)
-	$(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB)
-	./camd_simple > my_camd_simple.out
-	- diff camd_simple.out my_camd_simple.out
-
-#------------------------------------------------------------------------------
-# Remove all but the files in the original distribution
-#------------------------------------------------------------------------------
-
-clean:
-	- $(RM) $(CLEAN)
-
-purge: distclean
-
-distclean: clean
-	- $(RM) camd_demo my_camd_demo.out
-	- $(RM) camd_l_demo my_camd_l_demo.out
-	- $(RM) camd_demo2 my_camd_demo2.out
-	- $(RM) camd_simple my_camd_simple.out
diff -urN CAMD_orig/Demo/Makefile.am CAMD/Demo/Makefile.am
--- CAMD_orig/Demo/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ CAMD/Demo/Makefile.am	2007-09-18 15:24:56.000000000 -0400
@@ -0,0 +1,32 @@
+AM_CPPFLAGS = -I$(top_srcdir)/Include
+AM_LDFLAGS = -lm
+check_PROGRAMS = \
+	camd_demo \
+	camd_l_demo \
+	camd_demo2 \
+	camd_simple
+
+camd_demo_SOURCES = camd_demo.c
+camd_demo_LDADD = $(top_builddir)/Source/libcamd.la
+
+camd_l_demo_SOURCES = camd_l_demo.c
+camd_l_demo_LDADD = $(top_builddir)/Source/libcamd.la
+
+camd_demo2_SOURCES = camd_demo2.c
+camd_demo2_LDADD = $(top_builddir)/Source/libcamd.la
+
+camd_simple_SOURCES = camd_simple.c
+camd_simple_LDADD = $(top_builddir)/Source/libcamd.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 CAMD_orig/Makefile CAMD/Makefile
--- CAMD_orig/Makefile	2007-05-05 10:28:33.000000000 -0400
+++ CAMD/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-#------------------------------------------------------------------------------
-# CAMD Makefile (for GNU Make or original make)
-#------------------------------------------------------------------------------
-
-default: demo
-
-include ../UFconfig/UFconfig.mk
-
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not compile the FORTRAN versions, or MATLAB interface.
-demo:
-	( cd Lib    ; $(MAKE) )
-	( cd Demo   ; $(MAKE) )
-
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not compile the FORTRAN versions.
-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 )
-	( cd Doc    ; $(MAKE) clean )
-
-# clean, and then remove compiled programs and library archives
-purge:
-	( cd Lib    ; $(MAKE) purge )
-	( cd Demo   ; $(MAKE) purge )
-	( cd MATLAB ; $(MAKE) purge )
-	( cd Doc    ; $(MAKE) purge )
-
-distclean: purge
-
-# create PDF documents for the original distribution
-doc:
-	( cd Doc    ; $(MAKE) )
-
-# get ready for distribution
-dist: purge
-	( cd Demo   ; $(MAKE) dist )
-	( cd Doc    ; $(MAKE) )
-
-ccode: library
-
-lib: library
-
-# compile the MATLAB mexFunction
-mex:
-	( cd MATLAB ; $(MAKE) )
diff -urN CAMD_orig/Makefile.am CAMD/Makefile.am
--- CAMD_orig/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ CAMD/Makefile.am	2007-09-18 15:08:00.000000000 -0400
@@ -0,0 +1,3 @@
+SUBDIRS = Demo Source
+EXTRA_DIST = README.txt
+include_HEADERS = Include/camd.h Include/camd_internal.h
diff -urN CAMD_orig/Source/Makefile.am CAMD/Source/Makefile.am
--- CAMD_orig/Source/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ CAMD/Source/Makefile.am	2007-09-18 15:08:00.000000000 -0400
@@ -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 -urN CAMD_orig/configure.ac CAMD/configure.ac
--- CAMD_orig/configure.ac	1969-12-31 19:00:00.000000000 -0500
+++ CAMD/configure.ac	2007-09-18 15:08:17.000000000 -0400
@@ -0,0 +1,12 @@
+#                                               -*- Autoconf -*-
+AC_PREREQ(2.59)
+AC_INIT(camd, 2.2.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([Source/Makefile
+		 Demo/Makefile
+		 Makefile])
+AC_OUTPUT