projects / packages / libtomcrypt.git / blame
| Commit | Line | Data |
|---|---|---|
| 105aa51b JB |
1 | --- libtomcrypt-1.17/testprof/makefile.shared.orig 2007-05-12 16:46:25.000000000 +0200 |
| 2 | +++ libtomcrypt-1.17/testprof/makefile.shared 2013-05-19 15:00:01.416666385 +0200 | |
| 3 | @@ -1,4 +1,5 @@ | |
| 4 | -CC=libtool --mode=compile gcc | |
| 5 | +CC=libtool --mode=compile --tag=CC gcc | |
| 6 | +CCLD=libtool --mode=link --tag=CC gcc | |
| 7 | ||
| 8 | CFLAGS += -I../src/headers -I./ -Wall -W | |
| 9 | ||
| 10 | @@ -18,7 +19,7 @@ | |
| 11 | default: $(LIBTEST) | |
| 12 | ||
| 13 | $(LIBTEST): $(OBJECTS) | |
| 14 | - libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | xargs` -o $@ -rpath $(LIBPATH) -version-info $(VERSION) | |
| 15 | + $(CCLD) $(CFLAGS) `find . -type f | grep "[.]lo" | xargs` -o $@ -rpath $(LIBPATH) -version-info $(VERSION) ../libtomcrypt.la | |
| 16 | ||
| 17 | install: $(LIBTEST) | |
| 18 | libtool --silent --mode=install install -c $(LIBTEST) $(DESTDIR)$(LIBPATH)/$(LIBTEST) | |
| 19 | --- libtomcrypt-1.17/makefile.shared.orig 2007-05-12 16:46:25.000000000 +0200 | |
| 20 | +++ libtomcrypt-1.17/makefile.shared 2013-05-19 15:00:57.236664043 +0200 | |
| 21 | @@ -10,6 +10,7 @@ | |
| 22 | ||
| 23 | # Compiler and Linker Names | |
| 24 | CC=libtool --mode=compile --tag=CC gcc | |
| 25 | +CCLD=libtool --mode=link --tag=CC gcc | |
| 26 | ||
| 27 | # ranlib tools | |
| 28 | ifndef RANLIB | |
| 29 | @@ -242,20 +242,22 @@ | |
| 30 | src/hashes/sha2/sha256.o: src/hashes/sha2/sha256.c src/hashes/sha2/sha224.c | |
| 31 | ||
| 32 | #This rule makes the libtomcrypt library. | |
| 33 | +all: library testprof/$(LIBTEST) | |
| 34 | + | |
| 35 | library: $(LIBNAME) | |
| 36 | ||
| 37 | -testprof/$(LIBTEST): | |
| 38 | +testprof/$(LIBTEST): $(LIBNAME) | |
| 39 | cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) make -f makefile.shared | |
| 40 | ||
| 41 | objs: $(OBJECTS) | |
| 42 | ||
| 43 | -$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST) | |
| 44 | - libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) | |
| 45 | +$(LIBNAME): $(OBJECTS) | |
| 46 | + $(CCLD) $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) | |
| 47 | ||
| 48 | install: $(LIBNAME) | |
| 49 | install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) | |
| 50 | - cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install | |
| 51 | libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la | |
| 52 | + cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install | |
| 53 | install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) | |
| 54 | install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) | |
| 55 |