consolidate makefiles a bit
This commit is contained in:
parent
c2bb38555e
commit
d21d01bcb5
5
makefile
5
makefile
@ -5,11 +5,6 @@
|
|||||||
|
|
||||||
include makefile.include
|
include makefile.include
|
||||||
|
|
||||||
# The version
|
|
||||||
VERSION=1.17
|
|
||||||
|
|
||||||
PLATFORM := $(shell uname | sed -e 's/_.*//')
|
|
||||||
|
|
||||||
ifeq ($V,1)
|
ifeq ($V,1)
|
||||||
silent=
|
silent=
|
||||||
silent_stdout=
|
silent_stdout=
|
||||||
|
@ -2,6 +2,13 @@
|
|||||||
# Include makefile for libtomcrypt
|
# Include makefile for libtomcrypt
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# The version
|
||||||
|
VERSION=1.17
|
||||||
|
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
||||||
|
VERSION_LT=0:117
|
||||||
|
|
||||||
|
PLATFORM := $(shell uname | sed -e 's/_.*//')
|
||||||
|
|
||||||
# Compiler and Linker Names
|
# Compiler and Linker Names
|
||||||
ifndef PREFIX
|
ifndef PREFIX
|
||||||
PREFIX:=
|
PREFIX:=
|
||||||
|
@ -7,9 +7,6 @@
|
|||||||
|
|
||||||
include makefile.include
|
include makefile.include
|
||||||
|
|
||||||
# The version
|
|
||||||
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
|
||||||
VERSION=0:117
|
|
||||||
|
|
||||||
|
|
||||||
LT ?= libtool
|
LT ?= libtool
|
||||||
@ -212,13 +209,13 @@ library: $(LIBNAME)
|
|||||||
|
|
||||||
.PHONY: testprof/$(LIBTEST)
|
.PHONY: testprof/$(LIBTEST)
|
||||||
testprof/$(LIBTEST):
|
testprof/$(LIBTEST):
|
||||||
cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) LT=$(LT) CC="$(CC)" make -f makefile.shared
|
cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION_LT) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) LT=$(LT) CC="$(CC)" make -f makefile.shared
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -c $<
|
$(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
$(LIBNAME): $(OBJECTS)
|
$(LIBNAME): $(OBJECTS)
|
||||||
$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `find ./src -type f -name "*.lo"` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
|
$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `find ./src -type f -name "*.lo"` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_LT)
|
||||||
|
|
||||||
install: $(LIBNAME)
|
install: $(LIBNAME)
|
||||||
install -d $(DESTDIR)$(LIBPATH)
|
install -d $(DESTDIR)$(LIBPATH)
|
||||||
@ -232,7 +229,7 @@ install: $(LIBNAME)
|
|||||||
install_test: testprof/$(LIBTEST)
|
install_test: testprof/$(LIBTEST)
|
||||||
install -d $(DESTDIR)$(LIBPATH)
|
install -d $(DESTDIR)$(LIBPATH)
|
||||||
install -d $(DESTDIR)$(INCPATH)
|
install -d $(DESTDIR)$(INCPATH)
|
||||||
cd testprof ; CFLAGS="$(CFLAGS)" VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) LT=$(LT) CC=$(CC) make -f makefile.shared install
|
cd testprof ; CFLAGS="$(CFLAGS)" VERSION=$(VERSION_LT) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) LT=$(LT) CC=$(CC) make -f makefile.shared install
|
||||||
|
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
Loading…
Reference in New Issue
Block a user