1 diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
2 --- AMD/Demo/Makefile 2007-12-02 19:00:33.000000000 +0100
3 +++ AMD-shared/Demo/Makefile 2007-12-02 18:55:08.000000000 +0100
7 amd_demo: amd_demo.c library $(INC)
8 - $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB)
9 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo amd_demo.c ../Lib/libamd.la $(LIB)
10 ./amd_demo > my_amd_demo.out
11 - diff amd_demo.out my_amd_demo.out
13 amd_l_demo: amd_l_demo.c library $(INC)
14 - $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB)
15 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_l_demo amd_l_demo.c ../Lib/libamd.la $(LIB)
16 ./amd_l_demo > my_amd_l_demo.out
17 - diff amd_l_demo.out my_amd_l_demo.out
19 amd_demo2: amd_demo2.c library $(INC)
20 - $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB)
21 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo2 amd_demo2.c ../Lib/libamd.la $(LIB)
22 ./amd_demo2 > my_amd_demo2.out
23 - diff amd_demo2.out my_amd_demo2.out
25 amd_simple: amd_simple.c library $(INC)
26 - $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB)
27 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_simple amd_simple.c ../Lib/libamd.la $(LIB)
28 ./amd_simple > my_amd_simple.out
29 - diff amd_simple.out my_amd_simple.out
34 amd_f77demo: amd_f77demo.f f77lib
35 - $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \
37 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77demo amd_f77demo.f ../Lib/libamd.la $(F77LIB)
38 ./amd_f77demo > my_amd_f77demo.out
39 - diff amd_f77demo.out my_amd_f77demo.out
41 amd_f77simple: amd_f77simple.f f77lib
42 - $(F77) $(F77FLAGS) -o amd_f77simple amd_f77simple.f \
43 - ../Lib/libamdf77.a $(F77LIB)
44 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77simple amd_f77simple.f ../Lib/libamd.la $(F77LIB)
45 ./amd_f77simple > my_amd_f77simple.out
46 - diff amd_f77simple.out my_amd_f77simple.out
48 amd_f77wrapper.o: amd_f77wrapper.c
49 - $(C) -DDINT -c amd_f77wrapper.c
50 + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) -DDINT -I../Include -o amd_amd_f77wrapper.o amd_f77wrapper.c
52 -amd_f77cross: amd_f77cross.f amd_f77wrapper.o ../Lib/libamd.a
53 - $(F77) $(F77FLAGS) -o amd_f77cross amd_f77cross.f amd_f77wrapper.o \
54 - ../Lib/libamd.a $(F77LIB)
55 +amd_f77cross: amd_f77cross.f amd_f77wrapper.o ../Lib/libamd.la
56 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77cross amd_f77cross.f ../Lib/libamd.la $(F77LIB)
57 ./amd_f77cross > my_amd_f77cross.out
58 - diff amd_f77cross.out my_amd_f77cross.out
60 --- AMD/Lib/GNUmakefile.orig 2012-01-01 12:11:28.552693675 +0100
61 +++ AMD/Lib/GNUmakefile 2012-01-01 12:15:13.479367873 +0100
63 # AMD Makefile for compiling on Unix systems (for GNU make only)
64 #-------------------------------------------------------------------------------
69 include /usr/share/misc/SuiteSparse_config.mk
72 #-------------------------------------------------------------------------------
74 amd_global.o: ../Source/amd_global.c $(INC)
76 + libtool --tag=CC --mode=compile $(C) -c $< -o $@
78 amd_i_%.o: ../Source/amd_%.c $(INC)
79 - $(C) -DDINT -c $< -o $@
80 + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
82 amd_l_%.o: ../Source/amd_%.c $(INC)
83 - $(C) -DDLONG -c $< -o $@
84 + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
86 #-------------------------------------------------------------------------------
87 # Create the libamd.a library (C versions only)
88 #-------------------------------------------------------------------------------
90 -libamd.a: amd_global.o $(AMDI) $(AMDL)
91 - $(ARCHIVE) libamd.a $^
92 - - $(RANLIB) libamd.a
93 +libamd.la: amd_global.o $(AMDI) $(AMDL)
94 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $(^:.o=.lo) -lm
97 + install -d $(DESTDIR)$(libdir)
98 + libtool --mode=install install libamd.la $(DESTDIR)$(libdir)/libamd.la
100 #-------------------------------------------------------------------------------
101 # compile the Fortran versions and the libamdf77.a library
102 #-------------------------------------------------------------------------------
104 -fortran: libamdf77.a
105 +fortran: libamdf77.la
107 AMDF77 = amd.o amdbar.o
109 amd.o: ../Source/amd.f
110 - $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o
111 + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o
113 amdbar.o: ../Source/amdbar.f
114 - $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
115 + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
117 -libamdf77.a: $(AMDF77)
118 - $(ARCHIVE) libamdf77.a $^
119 - - $(RANLIB) libamdf77.a
120 +libamdf77.la: $(AMDF77)
121 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $(^:.o=.lo) -lm
123 #-------------------------------------------------------------------------------
124 # Remove all but the files in the original distribution
129 - - $(RM) libamd.a libamdf77.a
130 + - $(RM) libamd.la libamdf77.la