]>
Commit | Line | Data |
---|---|---|
a597b9d8 JB |
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 | |
3 | @@ -26,22 +26,22 @@ | |
4b8bb3e4 JR |
4 | dist: |
5 | ||
6 | amd_demo: amd_demo.c library $(INC) | |
a597b9d8 JB |
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) | |
4b8bb3e4 JR |
9 | ./amd_demo > my_amd_demo.out |
10 | - diff amd_demo.out my_amd_demo.out | |
11 | ||
12 | amd_l_demo: amd_l_demo.c library $(INC) | |
a597b9d8 JB |
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) | |
4b8bb3e4 JR |
15 | ./amd_l_demo > my_amd_l_demo.out |
16 | - diff amd_l_demo.out my_amd_l_demo.out | |
17 | ||
18 | amd_demo2: amd_demo2.c library $(INC) | |
a597b9d8 JB |
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) | |
4b8bb3e4 JR |
21 | ./amd_demo2 > my_amd_demo2.out |
22 | - diff amd_demo2.out my_amd_demo2.out | |
23 | ||
24 | amd_simple: amd_simple.c library $(INC) | |
a597b9d8 JB |
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) | |
4b8bb3e4 JR |
27 | ./amd_simple > my_amd_simple.out |
28 | - diff amd_simple.out my_amd_simple.out | |
29 | ||
a597b9d8 | 30 | @@ -54,23 +54,20 @@ |
4b8bb3e4 JR |
31 | cross: amd_f77cross |
32 | ||
33 | amd_f77demo: amd_f77demo.f f77lib | |
34 | - $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \ | |
35 | - $(F77LIB) | |
6c74c55f | 36 | + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.la $(F77LIB) |
4b8bb3e4 JR |
37 | ./amd_f77demo > my_amd_f77demo.out |
38 | - diff amd_f77demo.out my_amd_f77demo.out | |
39 | ||
40 | amd_f77simple: amd_f77simple.f f77lib | |
41 | - $(F77) $(F77FLAGS) -o amd_f77simple amd_f77simple.f \ | |
42 | - ../Lib/libamdf77.a $(F77LIB) | |
6c74c55f | 43 | + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77simple amd_f77simple.f ../Lib/libamdf77.la $(F77LIB) |
4b8bb3e4 JR |
44 | ./amd_f77simple > my_amd_f77simple.out |
45 | - diff amd_f77simple.out my_amd_f77simple.out | |
46 | ||
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 | |
50 | ||
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 | |
4529301e | 55 | + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77cross amd_f77cross.f ../Lib/libamd.la $(F77LIB) |
4b8bb3e4 JR |
56 | ./amd_f77cross > my_amd_f77cross.out |
57 | - diff amd_f77cross.out my_amd_f77cross.out | |
58 | ||
a597b9d8 JB |
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 | |
4b8bb3e4 JR |
61 | @@ -2,7 +2,7 @@ |
62 | # AMD Makefile for compiling on Unix systems (for GNU make only) | |
63 | #------------------------------------------------------------------------------- | |
64 | ||
ff2cfe95 JB |
65 | -default: libamd.a |
66 | +default: libamd.la | |
4b8bb3e4 | 67 | |
52e53b91 | 68 | include /usr/share/misc/SuiteSparse_config.mk |
4b8bb3e4 | 69 | |
a597b9d8 | 70 | @@ -29,37 +29,43 @@ |
4b8bb3e4 JR |
71 | #------------------------------------------------------------------------------- |
72 | ||
4b8bb3e4 JR |
73 | amd_i_%.o: ../Source/amd_%.c $(INC) |
74 | - $(C) -DDINT -c $< -o $@ | |
ff2cfe95 | 75 | + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@ |
4b8bb3e4 JR |
76 | |
77 | amd_l_%.o: ../Source/amd_%.c $(INC) | |
78 | - $(C) -DDLONG -c $< -o $@ | |
ff2cfe95 | 79 | + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@ |
4b8bb3e4 JR |
80 | |
81 | #------------------------------------------------------------------------------- | |
82 | # Create the libamd.a library (C versions only) | |
83 | #------------------------------------------------------------------------------- | |
84 | ||
a597b9d8 | 85 | -libamd.a: $(AMDI) $(AMDL) |
0df8ae65 | 86 | - $(ARCHIVE) libamd.a $^ |
ff2cfe95 | 87 | - - $(RANLIB) libamd.a |
a597b9d8 JB |
88 | +libamd.la: $(AMDI) $(AMDL) |
89 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $(^:.o=.lo) -lsuitesparseconfig -lm | |
4b8bb3e4 JR |
90 | + |
91 | +install: libamd.la | |
92 | + install -d $(DESTDIR)$(libdir) | |
a597b9d8 | 93 | + libtool --mode=install install libamd.la $(DESTDIR)$(libdir) |
4b8bb3e4 JR |
94 | |
95 | #------------------------------------------------------------------------------- | |
96 | # compile the Fortran versions and the libamdf77.a library | |
97 | #------------------------------------------------------------------------------- | |
98 | ||
ff2cfe95 JB |
99 | -fortran: libamdf77.a |
100 | +fortran: libamdf77.la | |
4b8bb3e4 JR |
101 | |
102 | AMDF77 = amd.o amdbar.o | |
103 | ||
104 | amd.o: ../Source/amd.f | |
105 | - $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o | |
ff2cfe95 | 106 | + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o |
4b8bb3e4 JR |
107 | |
108 | amdbar.o: ../Source/amdbar.f | |
109 | - $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o | |
ff2cfe95 | 110 | + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o |
4b8bb3e4 | 111 | |
ff2cfe95 | 112 | -libamdf77.a: $(AMDF77) |
0df8ae65 | 113 | - $(ARCHIVE) libamdf77.a $^ |
ff2cfe95 JB |
114 | - - $(RANLIB) libamdf77.a |
115 | +libamdf77.la: $(AMDF77) | |
116 | + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $(^:.o=.lo) -lm | |
a597b9d8 | 117 | |
cb5fb1c0 KK |
118 | +install-fortran: libamdf77.la |
119 | + install -d $(DESTDIR)$(libdir) | |
a597b9d8 JB |
120 | + libtool --mode=install install libamdf77.la $(DESTDIR)$(libdir) |
121 | + | |
4b8bb3e4 JR |
122 | #------------------------------------------------------------------------------- |
123 | # Remove all but the files in the original distribution | |
a597b9d8 JB |
124 | #------------------------------------------------------------------------------- |
125 | @@ -70,4 +76,4 @@ | |
4b8bb3e4 JR |
126 | purge: distclean |
127 | ||
128 | distclean: clean | |
ff2cfe95 JB |
129 | - - $(RM) libamd.a libamdf77.a |
130 | + - $(RM) libamd.la libamdf77.la |