TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #392 from orbea/libtool

Browse Source 
makefile.shared: Respect LIBTOOL.
(cherry picked from commit a528528a2b0bbce7f894c6b572611d80b9705ede)
This commit is contained in:
Steffen Jaeckel 2018-05-20 10:29:56 +02:00 committed by Steffen Jaeckel
parent 3d6181d0a7
commit e7f4c6e47f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
makefile.shared
View File

@ -16,19 +16,19 @@
PLATFORM := $(shell uname | sed -e 's/_.*//') PLATFORM := $(shell uname | sed -e 's/_.*//')
ifndef LT ifndef LIBTOOL
ifeq ($(PLATFORM), Darwin) ifeq ($(PLATFORM), Darwin)
LT:=glibtool LIBTOOL:=glibtool
else else
LT:=libtool LIBTOOL:=libtool
endif endif
endif endif
ifeq ($(PLATFORM), CYGWIN) ifeq ($(PLATFORM), CYGWIN)
NO_UNDEFINED:=-no-undefined NO_UNDEFINED:=-no-undefined
endif endif
LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC)
INSTALL_CMD = $(LT) --mode=install install INSTALL_CMD = $(LIBTOOL) --mode=install install
UNINSTALL_CMD = $(LT) --mode=uninstall rm UNINSTALL_CMD = $(LIBTOOL) --mode=uninstall rm
#Output filenames for various targets. #Output filenames for various targets.
ifndef LIBNAME ifndef LIBNAME
@ -49,15 +49,15 @@ src/ciphers/aes/aes_enc.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c
LOBJECTS = $(OBJECTS:.o=.lo) LOBJECTS = $(OBJECTS:.o=.lo)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
$(LT) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
test: $(call print-help,test,Builds the library and the 'test' application to run all self-tests) $(LIBNAME) $(TOBJECTS) test: $(call print-help,test,Builds the library and the 'test' application to run all self-tests) $(LIBNAME) $(TOBJECTS)
$(LT) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
# build the demos from a template # build the demos from a template
define DEMO_template define DEMO_template
$(1): $(call print-help,$(1),Builds the library and the '$(1)' demo) demos/$(1).o $$(LIBNAME) $(1): $(call print-help,$(1),Builds the library and the '$(1)' demo) demos/$(1).o $$(LIBNAME)
$$(LT) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1) $$(LIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
endef endef
$(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo)))) $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))