SOURCES: CAMD-shared.patch, CHOLMOD-shared.patch, CXSparse-shared....
baggins
baggins at pld-linux.org
Fri Dec 7 17:41:24 CET 2007
Author: baggins Date: Fri Dec 7 16:41:24 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use LDFLAGS for linking
---- Files affected:
SOURCES:
CAMD-shared.patch (1.1 -> 1.2) , CHOLMOD-shared.patch (1.3 -> 1.4) , CXSparse-shared.patch (1.1 -> 1.2) , UMFPACK-shared.patch (1.3 -> 1.4) , amd-shared.patch (1.1 -> 1.2) , ccolamd-shared.patch (1.1 -> 1.2) , colamd-shared.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/CAMD-shared.patch
diff -u SOURCES/CAMD-shared.patch:1.1 SOURCES/CAMD-shared.patch:1.2
--- SOURCES/CAMD-shared.patch:1.1 Fri Dec 7 02:55:13 2007
+++ SOURCES/CAMD-shared.patch Fri Dec 7 17:41:18 2007
@@ -6,25 +6,25 @@
camd_demo: camd_demo.c library $(INC)
- $(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o camd_demo camd_demo.c ../Lib/libcamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo camd_demo.c ../Lib/libcamd.la $(LIB)
./camd_demo > my_camd_demo.out
- diff camd_demo.out my_camd_demo.out
camd_l_demo: camd_l_demo.c library $(INC)
- $(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o camd_l_demo camd_l_demo.c ../Lib/libcamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_l_demo camd_l_demo.c ../Lib/libcamd.la $(LIB)
./camd_l_demo > my_camd_l_demo.out
- diff camd_l_demo.out my_camd_l_demo.out
camd_demo2: camd_demo2.c library $(INC)
- $(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o camd_demo2 camd_demo2.c ../Lib/libcamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo2 camd_demo2.c ../Lib/libcamd.la $(LIB)
./camd_demo2 > my_camd_demo2.out
- diff camd_demo2.out my_camd_demo2.out
camd_simple: camd_simple.c library $(INC)
- $(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o camd_simple camd_simple.c ../Lib/libcamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_simple camd_simple.c ../Lib/libcamd.la $(LIB)
./camd_simple > my_camd_simple.out
- diff camd_simple.out my_camd_simple.out
@@ -63,7 +63,7 @@
- $(AR) libcamd.a $^
- - $(RANLIB) libcamd.a
+libcamd.la: camd_global.o $(CAMDI) $(CAMDL)
-+ libtool --tag=CC --mode=link $(CC) -o libcamd.la -rpath $(libdir) $^ -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcamd.la -rpath $(libdir) $^ -lm
+
+install: libcamd.la
+ install -d $(DESTDIR)$(libdir)
================================================================
Index: SOURCES/CHOLMOD-shared.patch
diff -u SOURCES/CHOLMOD-shared.patch:1.3 SOURCES/CHOLMOD-shared.patch:1.4
--- SOURCES/CHOLMOD-shared.patch:1.3 Fri Dec 7 13:19:25 2007
+++ SOURCES/CHOLMOD-shared.patch Fri Dec 7 17:41:18 2007
@@ -40,15 +40,15 @@
cholmod_demo: library cholmod_demo.c cholmod_demo.h
- $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_demo cholmod_demo.c $(LIB2)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_demo cholmod_demo.c $(LIB2)
cholmod_simple: library cholmod_simple.c
- $(C) -o cholmod_simple $(I) cholmod_simple.c $(LIB2)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_simple cholmod_simple.c $(LIB2)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_simple cholmod_simple.c $(LIB2)
cholmod_l_demo: library cholmod_l_demo.c cholmod_demo.h
- $(C) -o cholmod_l_demo $(I) cholmod_l_demo.c $(LIB2)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_l_demo cholmod_l_demo.c $(LIB2)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_l_demo cholmod_l_demo.c $(LIB2)
readhb: readhb.f
$(F77) $(FFLAGS) -o readhb readhb.f
================================================================
Index: SOURCES/CXSparse-shared.patch
diff -u SOURCES/CXSparse-shared.patch:1.1 SOURCES/CXSparse-shared.patch:1.2
--- SOURCES/CXSparse-shared.patch:1.1 Fri Dec 7 17:27:06 2007
+++ SOURCES/CXSparse-shared.patch Fri Dec 7 17:41:18 2007
@@ -15,83 +15,83 @@
cs_demo1: $(CS) cs_demo1.c Makefile $(CS)
- $(CC) $(I) -o cs_demo1 cs_demo1.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_demo1 cs_demo1.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_demo1 cs_demo1.c $(CS) -lm
cs_demo2: $(CS) cs_demo2.c cs_demo.c cs_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_demo2 cs_demo2.c cs_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_demo2 cs_demo2.c cs_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_demo2 cs_demo2.c cs_demo.c $(CS) -lm
cs_demo3: $(CS) cs_demo3.c cs_demo.c cs_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_demo3 cs_demo3.c cs_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_demo3 cs_demo3.c cs_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_demo3 cs_demo3.c cs_demo.c $(CS) -lm
cs_di_demo1: $(CS) cs_di_demo1.c Makefile $(CS)
- $(CC) $(I) -o cs_di_demo1 cs_di_demo1.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_di_demo1 cs_di_demo1.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_di_demo1 cs_di_demo1.c $(CS) -lm
cs_di_demo2: $(CS) cs_di_demo2.c cs_di_demo.c cs_di_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_di_demo2 cs_di_demo2.c cs_di_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_di_demo2 cs_di_demo2.c cs_di_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_di_demo2 cs_di_demo2.c cs_di_demo.c $(CS) -lm
cs_di_demo3: $(CS) cs_di_demo3.c cs_di_demo.c cs_di_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_di_demo3 cs_di_demo3.c cs_di_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_di_demo3 cs_di_demo3.c cs_di_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_di_demo3 cs_di_demo3.c cs_di_demo.c $(CS) -lm
cs_ci_demo1: $(CS) cs_ci_demo1.c Makefile $(CS)
- $(CC) $(I) -o cs_ci_demo1 cs_ci_demo1.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_ci_demo1 cs_ci_demo1.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ci_demo1 cs_ci_demo1.c $(CS) -lm
cs_ci_demo2: $(CS) cs_ci_demo2.c cs_ci_demo.c cs_ci_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_ci_demo2 cs_ci_demo2.c cs_ci_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_ci_demo2 cs_ci_demo2.c cs_ci_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ci_demo2 cs_ci_demo2.c cs_ci_demo.c $(CS) -lm
cs_ci_demo3: $(CS) cs_ci_demo3.c cs_ci_demo.c cs_ci_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_ci_demo3 cs_ci_demo3.c cs_ci_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_ci_demo3 cs_ci_demo3.c cs_ci_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ci_demo3 cs_ci_demo3.c cs_ci_demo.c $(CS) -lm
cs_dl_demo1: $(CS) cs_dl_demo1.c Makefile $(CS)
- $(CC) $(I) -o cs_dl_demo1 cs_dl_demo1.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_dl_demo1 cs_dl_demo1.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_dl_demo1 cs_dl_demo1.c $(CS) -lm
cs_dl_demo2: $(CS) cs_dl_demo2.c cs_dl_demo.c cs_dl_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_dl_demo2 cs_dl_demo2.c cs_dl_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_dl_demo2 cs_dl_demo2.c cs_dl_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_dl_demo2 cs_dl_demo2.c cs_dl_demo.c $(CS) -lm
cs_dl_demo3: $(CS) cs_dl_demo3.c cs_dl_demo.c cs_dl_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_dl_demo3 cs_dl_demo3.c cs_dl_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_dl_demo3 cs_dl_demo3.c cs_dl_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_dl_demo3 cs_dl_demo3.c cs_dl_demo.c $(CS) -lm
cs_cl_demo1: $(CS) cs_cl_demo1.c Makefile $(CS)
- $(CC) $(I) -o cs_cl_demo1 cs_cl_demo1.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_cl_demo1 cs_cl_demo1.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_cl_demo1 cs_cl_demo1.c $(CS) -lm
cs_cl_demo2: $(CS) cs_cl_demo2.c cs_cl_demo.c cs_cl_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_cl_demo2 cs_cl_demo2.c cs_cl_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_cl_demo2 cs_cl_demo2.c cs_cl_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_cl_demo2 cs_cl_demo2.c cs_cl_demo.c $(CS) -lm
cs_cl_demo3: $(CS) cs_cl_demo3.c cs_cl_demo.c cs_cl_demo.h Makefile $(CS)
- $(CC) $(I) -o cs_cl_demo3 cs_cl_demo3.c cs_cl_demo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_cl_demo3 cs_cl_demo3.c cs_cl_demo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_cl_demo3 cs_cl_demo3.c cs_cl_demo.c $(CS) -lm
cs_idemo: $(CS) cs_idemo.c Makefile $(CS)
- $(CC) $(I) -o cs_idemo cs_idemo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o cs_idemo cs_idemo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o cs_idemo cs_idemo.c $(CS) -lm
cs_ldemo: $(CS) cs_ldemo.c Makefile $(CS)
- $(CC) $(I) -DCS_LONG -o cs_ldemo cs_ldemo.c $(CS) -lm
-+ libtool --tag=CC --mode=link $(CC) -DCS_LONG $(CFLAGS) -I../Include -o cs_ldemo cs_ldemo.c $(CS) -lm
++ libtool --tag=CC --mode=link $(CC) -DCS_LONG $(LDFLAGS) $(CFLAGS) -I../Include -o cs_ldemo cs_ldemo.c $(CS) -lm
clean:
@@ -135,7 +135,7 @@
- $(AR) libcxsparse.a $(CS)
- $(RANLIB) libcxsparse.a
+libcxsparse.la: $(CS)
-+ libtool --tag=CC --mode=link $(CC) -o libcxsparse.la -rpath $(libdir) $^ -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcxsparse.la -rpath $(libdir) $^ -lm
+
+install: libcxsparse.la
+ install -d $(DESTDIR)$(libdir)
================================================================
Index: SOURCES/UMFPACK-shared.patch
diff -u SOURCES/UMFPACK-shared.patch:1.3 SOURCES/UMFPACK-shared.patch:1.4
--- SOURCES/UMFPACK-shared.patch:1.3 Fri Dec 7 03:12:14 2007
+++ SOURCES/UMFPACK-shared.patch Fri Dec 7 17:41:18 2007
@@ -35,7 +35,7 @@
umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK)
- $(C) -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
# the GNU rules are simpler:
# umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed
@@ -44,7 +44,7 @@
umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
# double-precision, UF_long verion:
umfpack_dl_demo.c: umfpack_xx_demo.c umfpack_dl_demo.sed
@@ -52,7 +52,7 @@
umfpack_dl_demo: umfpack_dl_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
# complex, int verion:
umfpack_zi_demo.c: umfpack_xx_demo.c umfpack_zi_demo.sed
@@ -60,7 +60,7 @@
umfpack_zi_demo: umfpack_zi_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
# complex, UF_long verion:
umfpack_zl_demo.c: umfpack_xx_demo.c umfpack_zl_demo.sed
@@ -68,7 +68,7 @@
umfpack_zl_demo: umfpack_zl_demo.c $(INC) $(UMFPACK)
- $(C) -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple
./umfpack_simple
@@ -303,7 +303,7 @@
- $(AR) ../Lib/libumfpack.a $^
- - $(RANLIB) ../Lib/libumfpack.a
+../Lib/libumfpack.la: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
-+ libtool --tag=CC --mode=link $(CC) -o libumfpack.la -rpath $(libdir) $^ -lm -lamd -lblas
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $^ -lm -lamd -lblas
+
+install: libumfpack.la
+ install -d $(DESTDIR)$(libdir)
================================================================
Index: SOURCES/amd-shared.patch
diff -u SOURCES/amd-shared.patch:1.1 SOURCES/amd-shared.patch:1.2
--- SOURCES/amd-shared.patch:1.1 Sun Dec 2 19:15:32 2007
+++ SOURCES/amd-shared.patch Fri Dec 7 17:41:18 2007
@@ -6,25 +6,25 @@
amd_demo: amd_demo.c library $(INC)
- $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o amd_demo amd_demo.c ../Lib/libamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo amd_demo.c ../Lib/libamd.la $(LIB)
./amd_demo > my_amd_demo.out
- diff amd_demo.out my_amd_demo.out
amd_l_demo: amd_l_demo.c library $(INC)
- $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o amd_l_demo amd_l_demo.c ../Lib/libamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_l_demo amd_l_demo.c ../Lib/libamd.la $(LIB)
./amd_l_demo > my_amd_l_demo.out
- diff amd_l_demo.out my_amd_l_demo.out
amd_demo2: amd_demo2.c library $(INC)
- $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o amd_demo2 amd_demo2.c ../Lib/libamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo2 amd_demo2.c ../Lib/libamd.la $(LIB)
./amd_demo2 > my_amd_demo2.out
- diff amd_demo2.out my_amd_demo2.out
amd_simple: amd_simple.c library $(INC)
- $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB)
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) -I../Include -o amd_simple amd_simple.c ../Lib/libamd.la $(LIB)
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_simple amd_simple.c ../Lib/libamd.la $(LIB)
./amd_simple > my_amd_simple.out
- diff amd_simple.out my_amd_simple.out
@@ -34,14 +34,14 @@
amd_f77demo: amd_f77demo.f f77lib
- $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \
- $(F77LIB)
-+ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -I../Include -o amd_f77demo amd_f77demo.f ../Lib/libamd.la $(F77LIB)
++ libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77demo amd_f77demo.f ../Lib/libamd.la $(F77LIB)
./amd_f77demo > my_amd_f77demo.out
- diff amd_f77demo.out my_amd_f77demo.out
amd_f77simple: amd_f77simple.f f77lib
- $(F77) $(F77FLAGS) -o amd_f77simple amd_f77simple.f \
- ../Lib/libamdf77.a $(F77LIB)
-+ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -I../Include -o amd_f77simple amd_f77simple.f ../Lib/libamd.la $(F77LIB)
++ libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77simple amd_f77simple.f ../Lib/libamd.la $(F77LIB)
./amd_f77simple > my_amd_f77simple.out
- diff amd_f77simple.out my_amd_f77simple.out
@@ -53,7 +53,7 @@
- $(F77) $(F77FLAGS) -o amd_f77cross amd_f77cross.f amd_f77wrapper.o \
- ../Lib/libamd.a $(F77LIB)
+amd_f77cross: amd_f77cross.f amd_f77wrapper.o ../Lib/libamd.la
-+ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -I../Include -o amd_f77cross amd_f77cross.f ../Lib/libamd.la $(F77LIB)
++ libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(F77FLAGS) -I../Include -o amd_f77cross amd_f77cross.f ../Lib/libamd.la $(F77LIB)
./amd_f77cross > my_amd_f77cross.out
- diff amd_f77cross.out my_amd_f77cross.out
@@ -92,7 +92,7 @@
- $(AR) ../Lib/libamd.a $^
- - $(RANLIB) ../Lib/libamd.a
+../Lib/libamd.la: amd_global.o $(AMDI) $(AMDL)
-+ libtool --tag=CC --mode=link $(CC) -o libamd.la -rpath $(libdir) $^ -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $^ -lm
+
+install: libamd.la
+ install -d $(DESTDIR)$(libdir)
@@ -119,7 +119,7 @@
- $(AR) ../Lib/libamdf77.a $^
- - $(RANLIB) ../Lib/libamdf77.a
+../Lib/libamdf77.la: $(AMDF77)
-+ libtool --tag=F77 --mode=link $(F77) -o libamdf77.la -rpath $(libdir) $^ -lm
++ libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $^ -lm
#-------------------------------------------------------------------------------
# Remove all but the files in the original distribution
================================================================
Index: SOURCES/ccolamd-shared.patch
diff -u SOURCES/ccolamd-shared.patch:1.1 SOURCES/ccolamd-shared.patch:1.2
--- SOURCES/ccolamd-shared.patch:1.1 Sun Dec 2 16:30:34 2007
+++ SOURCES/ccolamd-shared.patch Fri Dec 7 17:41:18 2007
@@ -6,13 +6,13 @@
ccolamd_example: ccolamd_example.c library
- $(C) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.a -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.la -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.la -lm
- ./ccolamd_example > my_ccolamd_example.out
- diff ccolamd_example.out my_ccolamd_example.out
ccolamd_l_example: ccolamd_l_example.c library
- $(C) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.a -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.la -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.la -lm
- ./ccolamd_l_example > my_ccolamd_l_example.out
- diff ccolamd_example.out my_ccolamd_example.out
@@ -43,7 +43,7 @@
+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd_global.c
+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c
+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o
-+ libtool --tag=CC --mode=link $(CC) -o libccolamd.la -rpath $(libdir) ccolamd.o ccolamd_l.o ccolamd_global.o -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libccolamd.la -rpath $(libdir) ccolamd.o ccolamd_l.o ccolamd_global.o -lm
+
+install: libccolamd.la
+ install -d $(DESTDIR)$(libdir)
================================================================
Index: SOURCES/colamd-shared.patch
diff -u SOURCES/colamd-shared.patch:1.3 SOURCES/colamd-shared.patch:1.4
--- SOURCES/colamd-shared.patch:1.3 Sun Dec 2 15:56:46 2007
+++ SOURCES/colamd-shared.patch Fri Dec 7 17:41:18 2007
@@ -6,13 +6,13 @@
colamd_example: colamd_example.c library
- $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o colamd_example colamd_example.c ../Lib/libcolamd.la -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o colamd_example colamd_example.c ../Lib/libcolamd.la -lm
- ./colamd_example > my_colamd_example.out
- diff colamd_example.out my_colamd_example.out
colamd_l_example: colamd_l_example.c library
- $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a -lm
-+ libtool --tag=CC --mode=link $(CC) $(CFLAGS) $(I) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(I) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la -lm
- ./colamd_l_example > my_colamd_l_example.out
- diff colamd_example.out my_colamd_example.out
@@ -43,7 +43,7 @@
+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd_global.c
+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c
+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o
-+ libtool --tag=CC --mode=link $(CC) -o libcolamd.la -rpath $(libdir) colamd.o colamd_l.o colamd_global.o -lm
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcolamd.la -rpath $(libdir) colamd.o colamd_l.o colamd_global.o -lm
+
+install: libcolamd.la
+ install -d $(DESTDIR)$(libdir)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/CAMD-shared.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/CHOLMOD-shared.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/CXSparse-shared.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/UMFPACK-shared.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/amd-shared.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ccolamd-shared.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/colamd-shared.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list