]>
Commit | Line | Data |
---|---|---|
768b3ae5 JR |
1 | diff -ur CXSparse/Demo/Makefile CXSparse-shared/Demo/Makefile |
2 | --- CXSparse/Demo/Makefile 2007-12-07 17:08:37.000000000 +0100 | |
3 | +++ CXSparse-shared/Demo/Makefile 2007-12-07 17:14:42.000000000 +0100 | |
4 | @@ -3,7 +3,7 @@ | |
5 | ||
6 | I = -I../Include | |
7 | ||
8 | -CS = ../Lib/libcxsparse.a | |
9 | +CS = ../Lib/libcxsparse.la | |
10 | ||
11 | all: $(CS) cs_demo1 cs_demo2 cs_demo3 \ | |
12 | cs_di_demo1 cs_di_demo2 cs_di_demo3 \ | |
13 | @@ -91,67 +91,67 @@ | |
14 | ( cd ../Lib ; $(MAKE) ) | |
15 | ||
16 | cs_demo1: $(CS) cs_demo1.c Makefile $(CS) | |
17 | - $(CC) $(I) -o cs_demo1 cs_demo1.c $(CS) -lm | |
ad6b11e5 | 18 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_demo1 cs_demo1.c $(CS) -lm |
768b3ae5 JR |
19 | |
20 | cs_demo2: $(CS) cs_demo2.c cs_demo.c cs_demo.h Makefile $(CS) | |
21 | - $(CC) $(I) -o cs_demo2 cs_demo2.c cs_demo.c $(CS) -lm | |
ad6b11e5 | 22 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_demo2 cs_demo2.c cs_demo.c $(CS) -lm |
768b3ae5 JR |
23 | |
24 | cs_demo3: $(CS) cs_demo3.c cs_demo.c cs_demo.h Makefile $(CS) | |
25 | - $(CC) $(I) -o cs_demo3 cs_demo3.c cs_demo.c $(CS) -lm | |
ad6b11e5 | 26 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_demo3 cs_demo3.c cs_demo.c $(CS) -lm |
768b3ae5 JR |
27 | |
28 | ||
29 | ||
30 | ||
31 | cs_di_demo1: $(CS) cs_di_demo1.c Makefile $(CS) | |
32 | - $(CC) $(I) -o cs_di_demo1 cs_di_demo1.c $(CS) -lm | |
ad6b11e5 | 33 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_di_demo1 cs_di_demo1.c $(CS) -lm |
768b3ae5 JR |
34 | |
35 | cs_di_demo2: $(CS) cs_di_demo2.c cs_di_demo.c cs_di_demo.h Makefile $(CS) | |
36 | - $(CC) $(I) -o cs_di_demo2 cs_di_demo2.c cs_di_demo.c $(CS) -lm | |
ad6b11e5 | 37 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_di_demo2 cs_di_demo2.c cs_di_demo.c $(CS) -lm |
768b3ae5 JR |
38 | |
39 | cs_di_demo3: $(CS) cs_di_demo3.c cs_di_demo.c cs_di_demo.h Makefile $(CS) | |
40 | - $(CC) $(I) -o cs_di_demo3 cs_di_demo3.c cs_di_demo.c $(CS) -lm | |
ad6b11e5 | 41 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_di_demo3 cs_di_demo3.c cs_di_demo.c $(CS) -lm |
768b3ae5 JR |
42 | |
43 | ||
44 | ||
45 | ||
46 | cs_ci_demo1: $(CS) cs_ci_demo1.c Makefile $(CS) | |
47 | - $(CC) $(I) -o cs_ci_demo1 cs_ci_demo1.c $(CS) -lm | |
ad6b11e5 | 48 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ci_demo1 cs_ci_demo1.c $(CS) -lm |
768b3ae5 JR |
49 | |
50 | cs_ci_demo2: $(CS) cs_ci_demo2.c cs_ci_demo.c cs_ci_demo.h Makefile $(CS) | |
51 | - $(CC) $(I) -o cs_ci_demo2 cs_ci_demo2.c cs_ci_demo.c $(CS) -lm | |
ad6b11e5 | 52 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ci_demo2 cs_ci_demo2.c cs_ci_demo.c $(CS) -lm |
768b3ae5 JR |
53 | |
54 | cs_ci_demo3: $(CS) cs_ci_demo3.c cs_ci_demo.c cs_ci_demo.h Makefile $(CS) | |
55 | - $(CC) $(I) -o cs_ci_demo3 cs_ci_demo3.c cs_ci_demo.c $(CS) -lm | |
ad6b11e5 | 56 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ci_demo3 cs_ci_demo3.c cs_ci_demo.c $(CS) -lm |
768b3ae5 JR |
57 | |
58 | ||
59 | ||
60 | cs_dl_demo1: $(CS) cs_dl_demo1.c Makefile $(CS) | |
61 | - $(CC) $(I) -o cs_dl_demo1 cs_dl_demo1.c $(CS) -lm | |
ad6b11e5 | 62 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_dl_demo1 cs_dl_demo1.c $(CS) -lm |
768b3ae5 JR |
63 | |
64 | cs_dl_demo2: $(CS) cs_dl_demo2.c cs_dl_demo.c cs_dl_demo.h Makefile $(CS) | |
65 | - $(CC) $(I) -o cs_dl_demo2 cs_dl_demo2.c cs_dl_demo.c $(CS) -lm | |
ad6b11e5 | 66 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_dl_demo2 cs_dl_demo2.c cs_dl_demo.c $(CS) -lm |
768b3ae5 JR |
67 | |
68 | cs_dl_demo3: $(CS) cs_dl_demo3.c cs_dl_demo.c cs_dl_demo.h Makefile $(CS) | |
69 | - $(CC) $(I) -o cs_dl_demo3 cs_dl_demo3.c cs_dl_demo.c $(CS) -lm | |
ad6b11e5 | 70 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_dl_demo3 cs_dl_demo3.c cs_dl_demo.c $(CS) -lm |
768b3ae5 JR |
71 | |
72 | ||
73 | cs_cl_demo1: $(CS) cs_cl_demo1.c Makefile $(CS) | |
74 | - $(CC) $(I) -o cs_cl_demo1 cs_cl_demo1.c $(CS) -lm | |
ad6b11e5 | 75 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_cl_demo1 cs_cl_demo1.c $(CS) -lm |
768b3ae5 JR |
76 | |
77 | cs_cl_demo2: $(CS) cs_cl_demo2.c cs_cl_demo.c cs_cl_demo.h Makefile $(CS) | |
78 | - $(CC) $(I) -o cs_cl_demo2 cs_cl_demo2.c cs_cl_demo.c $(CS) -lm | |
ad6b11e5 | 79 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_cl_demo2 cs_cl_demo2.c cs_cl_demo.c $(CS) -lm |
768b3ae5 JR |
80 | |
81 | cs_cl_demo3: $(CS) cs_cl_demo3.c cs_cl_demo.c cs_cl_demo.h Makefile $(CS) | |
82 | - $(CC) $(I) -o cs_cl_demo3 cs_cl_demo3.c cs_cl_demo.c $(CS) -lm | |
ad6b11e5 | 83 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_cl_demo3 cs_cl_demo3.c cs_cl_demo.c $(CS) -lm |
768b3ae5 JR |
84 | |
85 | ||
86 | ||
87 | ||
88 | cs_idemo: $(CS) cs_idemo.c Makefile $(CS) | |
89 | - $(CC) $(I) -o cs_idemo cs_idemo.c $(CS) -lm | |
ad6b11e5 | 90 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_idemo cs_idemo.c $(CS) -lm |
768b3ae5 JR |
91 | |
92 | cs_ldemo: $(CS) cs_ldemo.c Makefile $(CS) | |
93 | - $(CC) $(I) -DCS_LONG -o cs_ldemo cs_ldemo.c $(CS) -lm | |
ad6b11e5 | 94 | + libtool --tag=CC --mode=link $(CC) -DCS_LONG $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ldemo cs_ldemo.c $(CS) -lm |
768b3ae5 JR |
95 | |
96 | ||
97 | clean: | |
768b3ae5 JR |
98 | diff -ur CXSparse/Lib/Makefile CXSparse-shared/Lib/Makefile |
99 | --- CXSparse/Lib/Makefile 2007-12-07 17:08:37.000000000 +0100 | |
100 | +++ CXSparse-shared/Lib/Makefile 2007-12-07 17:17:19.000000000 +0100 | |
101 | @@ -6,7 +6,7 @@ | |
102 | AR = ar cr | |
103 | RANLIB = ranlib | |
104 | ||
105 | -all: libcxsparse.a | |
106 | +all: libcxsparse.la | |
107 | ||
108 | CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \ | |
109 | cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \ | |
110 | @@ -71,23 +71,26 @@ | |
111 | $(CS): ../Include/cs.h Makefile | |
112 | ||
113 | cs_convert.o: ../Source/cs_convert.c | |
114 | - $(CC) $(CFLAGS) $(I) -c $< -o $@ | |
115 | + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c $< -o $@ | |
116 | ||
117 | %_di.o : ../Source/%.c | |
118 | - $(CC) $(CFLAGS) $(I) -c $< -o $@ | |
119 | + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c $< -o $@ | |
120 | ||
121 | %_dl.o : ../Source/%.c | |
122 | - $(CC) $(CFLAGS) $(I) -DCS_LONG -c $< -o $@ | |
123 | + libtool --tag=CC --mode=compile $(CC) -DCS_LONG $(CFLAGS) $(I) -c $< -o $@ | |
124 | ||
125 | %_ci.o : ../Source/%.c | |
126 | - $(CC) $(CFLAGS) $(I) -DCS_COMPLEX -c $< -o $@ | |
127 | + libtool --tag=CC --mode=compile $(CC) -DCS_COMPLEX $(CFLAGS) $(I) -c $< -o $@ | |
128 | ||
129 | %_cl.o : ../Source/%.c | |
130 | - $(CC) $(CFLAGS) $(I) -DCS_LONG -DCS_COMPLEX -c $< -o $@ | |
131 | + libtool --tag=CC --mode=compile $(CC) -DCS_LONG -DCS_COMPLEX $(CFLAGS) $(I) -c $< -o $@ | |
132 | ||
133 | -libcxsparse.a: $(CS) | |
134 | - $(AR) libcxsparse.a $(CS) | |
135 | - $(RANLIB) libcxsparse.a | |
136 | +libcxsparse.la: $(CS) | |
cabedbb7 | 137 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcxsparse.la -rpath $(libdir) $(^:.o=.lo) -lm |
768b3ae5 JR |
138 | + |
139 | +install: libcxsparse.la | |
140 | + install -d $(DESTDIR)$(libdir) | |
141 | + libtool --mode=install cp libcxsparse.la $(DESTDIR)$(libdir)/libcxsparse.la | |
142 | ||
143 | clean: | |
144 | rm -f *.o |