]>
Commit | Line | Data |
---|---|---|
4b8bb3e4 JR |
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 | |
4 | @@ -23,22 +23,22 @@ | |
5 | dist: | |
6 | ||
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) $(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 | |
12 | ||
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) $(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 | |
18 | ||
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) $(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 | |
24 | ||
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) $(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 | |
30 | ||
31 | @@ -51,23 +51,20 @@ | |
32 | cross: amd_f77cross | |
33 | ||
34 | amd_f77demo: amd_f77demo.f f77lib | |
35 | - $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \ | |
36 | - $(F77LIB) | |
37 | + libtool --tag=F77 --mode=link $(F77) $(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 | |
40 | ||
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) $(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 | |
47 | ||
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 | |
51 | ||
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) $(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 | |
59 | ||
60 | diff -ur AMD/Lib/GNUmakefile AMD-shared/Lib/GNUmakefile | |
61 | --- AMD/Lib/GNUmakefile 2007-12-02 19:00:35.000000000 +0100 | |
62 | +++ AMD-shared/Lib/GNUmakefile 2007-12-02 18:59:22.000000000 +0100 | |
63 | @@ -2,7 +2,7 @@ | |
64 | # AMD Makefile for compiling on Unix systems (for GNU make only) | |
65 | #------------------------------------------------------------------------------- | |
66 | ||
67 | -default: ../Lib/libamd.a | |
68 | +default: ../Lib/libamd.la | |
69 | ||
70 | include /usr/share/misc/UFconfig.mk | |
71 | ||
72 | @@ -29,39 +29,41 @@ | |
73 | #------------------------------------------------------------------------------- | |
74 | ||
75 | amd_global.o: ../Source/amd_global.c $(INC) | |
76 | - $(C) -c $< -o $@ | |
77 | + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@ | |
78 | ||
79 | amd_i_%.o: ../Source/amd_%.c $(INC) | |
80 | - $(C) -DDINT -c $< -o $@ | |
81 | + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@ | |
82 | ||
83 | amd_l_%.o: ../Source/amd_%.c $(INC) | |
84 | - $(C) -DDLONG -c $< -o $@ | |
85 | + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@ | |
86 | ||
87 | #------------------------------------------------------------------------------- | |
88 | # Create the libamd.a library (C versions only) | |
89 | #------------------------------------------------------------------------------- | |
90 | ||
91 | -../Lib/libamd.a: amd_global.o $(AMDI) $(AMDL) | |
92 | - $(AR) ../Lib/libamd.a $^ | |
93 | - - $(RANLIB) ../Lib/libamd.a | |
94 | +../Lib/libamd.la: amd_global.o $(AMDI) $(AMDL) | |
95 | + libtool --tag=CC --mode=link $(CC) -o libamd.la -rpath $(libdir) $^ -lm | |
96 | + | |
97 | +install: libamd.la | |
98 | + install -d $(DESTDIR)$(libdir) | |
99 | + libtool --mode=install cp libamd.la $(DESTDIR)$(libdir)/libamd.la | |
100 | ||
101 | #------------------------------------------------------------------------------- | |
102 | # compile the Fortran versions and the libamdf77.a library | |
103 | #------------------------------------------------------------------------------- | |
104 | ||
105 | -fortran: ../Lib/libamdf77.a | |
106 | +fortran: ../Lib/libamdf77.la | |
107 | ||
108 | AMDF77 = amd.o amdbar.o | |
109 | ||
110 | amd.o: ../Source/amd.f | |
111 | - $(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o | |
112 | + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) ../Source/amd.f -o amd.o | |
113 | ||
114 | amdbar.o: ../Source/amdbar.f | |
115 | - $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o | |
116 | + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) ../Source/amdbar.f -o amdbar.o | |
117 | ||
118 | -../Lib/libamdf77.a: $(AMDF77) | |
119 | - $(AR) ../Lib/libamdf77.a $^ | |
120 | - - $(RANLIB) ../Lib/libamdf77.a | |
121 | +../Lib/libamdf77.la: $(AMDF77) | |
122 | + libtool --tag=F77 --mode=link $(F77) -o libamdf77.la -rpath $(libdir) $^ -lm | |
123 | ||
124 | #------------------------------------------------------------------------------- | |
125 | # Remove all but the files in the original distribution | |
126 | @@ -73,4 +71,4 @@ | |
127 | purge: distclean | |
128 | ||
129 | distclean: clean | |
130 | - - $(RM) ../Lib/libamd.a ../Lib/libamdf77.a | |
131 | + - $(RM) ../Lib/libamd.la ../Lib/libamdf77.la |