- use LDFLAGS for linking

Changed files:
    amd-shared.patch -> 1.2

diff --git a/amd-shared.patch b/amd-shared.patch
index a6a9b0147636a303620c556fb4deda0993f0bd66..7681944a3b1b365cd1680d019d549eab40e34a44 100644 (file)
--- a/amd-shared.patch
+++ b/amd-shared.patch
@@ -6,25 +6,25 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
  
  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 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
  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 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
 -      $(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 @@ diff -ur AMD/Lib/GNUmakefile AMD-shared/Lib/GNUmakefile
 -      $(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 @@ diff -ur AMD/Lib/GNUmakefile AMD-shared/Lib/GNUmakefile
 -      $(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