projects / packages / CAMD.git / blame
| Commit | Line | Data |
|---|---|---|
| be3a8209 JR |
1 | diff -ur camd/Demo/Makefile camd-shared/Demo/Makefile |
| 2 | --- camd/Demo/Makefile 2007-12-02 19:00:33.000000000 +0100 | |
| 3 | +++ camd-shared/Demo/Makefile 2007-12-02 18:55:08.000000000 +0100 | |
| 4 | @@ -23,22 +23,22 @@ | |
| 5 | dist: | |
| 6 | ||
| 7 | camd_demo: camd_demo.c library $(INC) | |
| 8 | - $(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB) | |
| 7adbe8c9 | 9 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo camd_demo.c ../Lib/libcamd.la $(LIB) |
| be3a8209 JR |
10 | ./camd_demo > my_camd_demo.out |
| 11 | - diff camd_demo.out my_camd_demo.out | |
| 12 | ||
| 13 | camd_l_demo: camd_l_demo.c library $(INC) | |
| 14 | - $(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB) | |
| 7adbe8c9 | 15 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_l_demo camd_l_demo.c ../Lib/libcamd.la $(LIB) |
| be3a8209 JR |
16 | ./camd_l_demo > my_camd_l_demo.out |
| 17 | - diff camd_l_demo.out my_camd_l_demo.out | |
| 18 | ||
| 19 | camd_demo2: camd_demo2.c library $(INC) | |
| 20 | - $(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB) | |
| 7adbe8c9 | 21 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo2 camd_demo2.c ../Lib/libcamd.la $(LIB) |
| be3a8209 JR |
22 | ./camd_demo2 > my_camd_demo2.out |
| 23 | - diff camd_demo2.out my_camd_demo2.out | |
| 24 | ||
| 25 | camd_simple: camd_simple.c library $(INC) | |
| 26 | - $(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB) | |
| 7adbe8c9 | 27 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_simple camd_simple.c ../Lib/libcamd.la $(LIB) |
| be3a8209 JR |
28 | ./camd_simple > my_camd_simple.out |
| 29 | - diff camd_simple.out my_camd_simple.out | |
| 30 | ||
| 31 | diff -ur camd/Lib/GNUmakefile camd-shared/Lib/GNUmakefile | |
| 32 | --- camd/Lib/GNUmakefile 2007-12-02 19:00:35.000000000 +0100 | |
| 33 | +++ camd-shared/Lib/GNUmakefile 2007-12-02 18:59:22.000000000 +0100 | |
| 34 | @@ -2,7 +2,7 @@ | |
| 35 | # CAMD Makefile for compiling on Unix systems (for GNU make only) | |
| 36 | #------------------------------------------------------------------------------- | |
| 37 | ||
| 38 | -default: libcamd.a | |
| 39 | +default: libcamd.la | |
| 40 | ||
| 41 | include /usr/share/misc/UFconfig.mk | |
| 42 | ||
| 43 | @@ -29,21 +29,24 @@ | |
| 44 | #------------------------------------------------------------------------------- | |
| 45 | ||
| 46 | camd_global.o: ../Source/camd_global.c $(INC) | |
| 47 | - $(C) -c $< -o $@ | |
| 48 | + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@ | |
| 49 | ||
| 50 | camd_i_%.o: ../Source/camd_%.c $(INC) | |
| 51 | - $(C) -DDINT -c $< -o $@ | |
| 52 | + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@ | |
| 53 | ||
| 54 | camd_l_%.o: ../Source/camd_%.c $(INC) | |
| 55 | - $(C) -DDLONG -c $< -o $@ | |
| 56 | + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@ | |
| 57 | ||
| 58 | #------------------------------------------------------------------------------- | |
| 59 | # Create the libcamd.a library (C versions only) | |
| 60 | #------------------------------------------------------------------------------- | |
| 61 | ||
| 62 | -libcamd.a: camd_global.o $(CAMDI) $(CAMDL) | |
| 63 | - $(AR) libcamd.a $^ | |
| 64 | - - $(RANLIB) libcamd.a | |
| 65 | +libcamd.la: camd_global.o $(CAMDI) $(CAMDL) | |
| 7adbe8c9 | 66 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcamd.la -rpath $(libdir) $^ -lm |
| be3a8209 JR |
67 | + |
| 68 | +install: libcamd.la | |
| 69 | + install -d $(DESTDIR)$(libdir) | |
| 70 | + libtool --mode=install cp libcamd.la $(DESTDIR)$(libdir)/libcamd.la | |
| 71 | ||
| 72 | #------------------------------------------------------------------------------- | |
| 73 | # Remove all but the files in the original distribution | |
| 74 | @@ -73,4 +71,4 @@ | |
| 75 | purge: distclean | |
| 76 | ||
| 77 | distclean: clean | |
| 78 | - - $(RM) libcamd.a | |
| 79 | + - $(RM) libcamd.la |