1 --- AMD/Demo/Makefile.orig 2014-10-01 18:52:11.373161939 +0200
2 +++ AMD/Demo/Makefile 2014-10-01 18:55:15.923154199 +0200
6 amd_demo: amd_demo.c library $(INC)
7 - $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB2)
8 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo amd_demo.c ../Lib/libamd.la $(LIB2)
9 ./amd_demo > my_amd_demo.out
10 - diff amd_demo.out my_amd_demo.out
12 amd_l_demo: amd_l_demo.c library $(INC)
13 - $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB2)
14 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_l_demo amd_l_demo.c ../Lib/libamd.la $(LIB2)
15 ./amd_l_demo > my_amd_l_demo.out
16 - diff amd_l_demo.out my_amd_l_demo.out
18 amd_demo2: amd_demo2.c library $(INC)
19 - $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB2)
20 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo2 amd_demo2.c ../Lib/libamd.la $(LIB2)
21 ./amd_demo2 > my_amd_demo2.out
22 - diff amd_demo2.out my_amd_demo2.out
24 amd_simple: amd_simple.c library $(INC)
25 - $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB2)
26 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_simple amd_simple.c ../Lib/libamd.la $(LIB2)
27 ./amd_simple > my_amd_simple.out
28 - diff amd_simple.out my_amd_simple.out
33 amd_f77demo: amd_f77demo.f f77lib
34 - $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \
36 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.la $(F77LIB)
37 ./amd_f77demo > my_amd_f77demo.out
38 - diff amd_f77demo.out my_amd_f77demo.out
40 amd_f77simple: amd_f77simple.f f77lib
41 - $(F77) $(F77FLAGS) -o amd_f77simple amd_f77simple.f \
42 - ../Lib/libamdf77.a $(F77LIB)
43 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77simple amd_f77simple.f ../Lib/libamdf77.la $(F77LIB)
44 ./amd_f77simple > my_amd_f77simple.out
45 - diff amd_f77simple.out my_amd_f77simple.out
47 amd_f77wrapper.o: amd_f77wrapper.c
48 - $(C) -DDINT -c amd_f77wrapper.c
49 + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) -DDINT -I../Include -o amd_amd_f77wrapper.o amd_f77wrapper.c
51 -amd_f77cross: amd_f77cross.f amd_f77wrapper.o ../Lib/libamd.a
52 - $(F77) $(F77FLAGS) -o amd_f77cross amd_f77cross.f amd_f77wrapper.o \
53 - ../Lib/libamd.a $(F77LIB)
54 +amd_f77cross: amd_f77cross.f amd_f77wrapper.o ../Lib/libamd.la
55 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77cross amd_f77cross.f ../Lib/libamd.la $(F77LIB)
56 ./amd_f77cross > my_amd_f77cross.out
57 - diff amd_f77cross.out my_amd_f77cross.out
59 --- AMD/Lib/GNUmakefile.orig 2014-10-01 18:52:11.376495274 +0200
60 +++ AMD/Lib/GNUmakefile 2014-10-01 18:58:19.216479852 +0200
62 # AMD Makefile for compiling on Unix systems (for GNU make only)
63 #-------------------------------------------------------------------------------
68 include /usr/share/misc/SuiteSparse_config.mk
71 #-------------------------------------------------------------------------------
73 amd_i_%.o: ../Source/amd_%.c $(INC)
74 - $(C) -DDINT -c $< -o $@
75 + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
77 amd_l_%.o: ../Source/amd_%.c $(INC)
78 - $(C) -DDLONG -c $< -o $@
79 + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
81 #-------------------------------------------------------------------------------
82 # Create the libamd.a library (C versions only)
83 #-------------------------------------------------------------------------------
85 -libamd.a: $(AMDI) $(AMDL)
86 - $(ARCHIVE) libamd.a $^
87 - - $(RANLIB) libamd.a
88 +libamd.la: $(AMDI) $(AMDL)
89 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $(^:.o=.lo) -lsuitesparseconfig -lm
92 + install -d $(DESTDIR)$(libdir)
93 + libtool --mode=install install libamd.la $(DESTDIR)$(libdir)
95 #-------------------------------------------------------------------------------
96 # compile the Fortran versions and the libamdf77.a library
97 #-------------------------------------------------------------------------------
100 +fortran: libamdf77.la
102 AMDF77 = amd.o amdbar.o
104 amd.o: ../Source/amd.f
105 - $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o
106 + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o
108 amdbar.o: ../Source/amdbar.f
109 - $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
110 + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
112 -libamdf77.a: $(AMDF77)
113 - $(ARCHIVE) libamdf77.a $^
114 - - $(RANLIB) libamdf77.a
115 +libamdf77.la: $(AMDF77)
116 + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $(^:.o=.lo) -lm
118 +install-fortran: libamdf77.la
119 + install -d $(DESTDIR)$(libdir)
120 + libtool --mode=install install libamdf77.la $(DESTDIR)$(libdir)
122 #-------------------------------------------------------------------------------
123 # Remove all but the files in the original distribution
124 #-------------------------------------------------------------------------------
129 - - $(RM) libamd.a libamdf77.a
130 + - $(RM) libamd.la libamdf77.la