- up to 2.7.1

Changed files:
    colamd-shared.patch -> 1.3

diff --git a/colamd-shared.patch b/colamd-shared.patch
index a07622a09474f72d936adb9ccd9ba664a0ae274a..a24325ebcb7a8cec51ffced8d7eacae9dd330c46 100644 (file)
--- a/colamd-shared.patch
+++ b/colamd-shared.patch
@@ -1,54 +1,49 @@
---- COLAMD/Makefile~   2007-03-27 02:02:53.388937452 +0300
-+++ COLAMD/Makefile    2007-03-27 02:02:58.359049009 +0300
-@@ -1,25 +1,26 @@
+diff -ur COLAMD/Demo/Makefile COLAMD-shared/Demo/Makefile
+--- COLAMD/Demo/Makefile       2007-12-02 15:48:48.000000000 +0100
++++ COLAMD-shared/Demo/Makefile        2007-12-02 15:48:31.000000000 +0100
+@@ -20,12 +20,12 @@
+ dist:
  
--default: libcolamd.a colamd_example colamd_l_example
-+default: libcolamd.la colamd_example colamd_l_example
-+libdir        := /usr/lib
- 
- include /usr/share/misc/UFconfig.mk
- 
--colamd_example: colamd_example.c libcolamd.a
--      $(CC) $(CFLAGS) $(I) -o colamd_example colamd_example.c libcolamd.a -lm
-+colamd_example: colamd_example.c libcolamd.la
-+      libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o colamd_example colamd_example.c libcolamd.la -lm
+ colamd_example: colamd_example.c library
+-      $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a -lm
++      libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o colamd_example colamd_example.c ../Lib/libcolamd.la -lm
        - ./colamd_example > my_colamd_example.out
        - diff colamd_example.out my_colamd_example.out
  
--colamd_l_example: colamd_l_example.c libcolamd.a
--      $(CC) $(CFLAGS) $(I) -o colamd_l_example colamd_l_example.c libcolamd.a -lm
-+colamd_l_example: colamd_l_example.c libcolamd.la
-+      libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o colamd_l_example colamd_l_example.c libcolamd.la -lm
+ colamd_l_example: colamd_l_example.c library
+-      $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a -lm
++      libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la -lm
        - ./colamd_l_example > my_colamd_l_example.out
        - diff colamd_example.out my_colamd_example.out
  
- purge: distclean
+diff -ur COLAMD/Lib/Makefile COLAMD-shared/Lib/Makefile
+--- COLAMD/Lib/Makefile        2007-12-02 15:48:48.000000000 +0100
++++ COLAMD-shared/Lib/Makefile 2007-12-02 15:47:12.000000000 +0100
+@@ -2,7 +2,8 @@
+ # COLAMD Makefile
+ #-------------------------------------------------------------------------------
  
- distclean: clean2
--      - $(RM) libcolamd.a
-+      - $(RM) libcolamd.la
+-default: libcolamd.a
++default: libcolamd.la
++libdir        := /usr/lib
+ 
+ include /usr/share/misc/UFconfig.mk
  
- clean2: clean
--      - $(RM) *.o *.dll colamd_example colamd_l_example
-+      - $(RM) *.o *.la *.a *.so *.dll colamd_example colamd_l_example
-       - $(RM) colamd2mex.mex* symamd2mex.mex*
-       - $(RM) colamdtestmex.mex* symamdtestmex.mex*
-       - $(RM) my_colamd_example.out my_colamd_l_example.out
-@@ -35,15 +36,20 @@
-       $(MEX) $(I) symamdtestmex.c libcolamd.a
+@@ -13,15 +14,20 @@
+ SRC = ../Source/colamd.c ../Source/colamd_global.c
  
  # creates libcolamd.a, a C-callable COLAMD library
--libcolamd.a:  colamd.c colamd_global.c colamd.h
--      $(CC) $(CFLAGS) $(I) -c colamd_global.c
--      $(CC) $(CFLAGS) $(I) -c colamd.c
--      $(CC) $(CFLAGS) $(I) -c colamd.c -DDLONG -o colamd_l.o
+-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
 +libcolamd.a: libcolamd.la
-+libcolamd.la:  colamd.c colamd_global.c colamd.h
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c colamd_global.c
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c colamd.c
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c colamd.c -DDLONG -o colamd_l.o
-+      libtool --tag=CC --mode=link $(CC) -o libcolamd.la -rpath $(libdir) colamd.lo colamd_l.lo colamd_global.lo -lm
++libcolamd.la:  $(SRC) $(INC)
++      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c
++      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c
++      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o
++      libtool --tag=CC --mode=link $(CC) -o libcolamd.la -rpath $(libdir) colamd.o colamd_l.o colamd_global.o -lm
 +
 +install: libcolamd.la
 +      install -d $(DESTDIR)$(libdir)
@@ -62,3 +57,9 @@
  
  clean:
        - $(RM) $(CLEAN)
+@@ -29,4 +35,4 @@
+ purge: distclean
+ 
+ distclean: clean
+-      - $(RM) libcolamd.a
++      - $(RM) libcolamd.la