Skip to content

Commit e7f4c6e

Browse files
committed
Merge pull request #392 from orbea/libtool
makefile.shared: Respect LIBTOOL. (cherry picked from commit a528528)
1 parent 3d6181d commit e7f4c6e

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

makefile.shared

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
PLATFORM := $(shell uname | sed -e 's/_.*//')
1818

19-
ifndef LT
19+
ifndef LIBTOOL
2020
ifeq ($(PLATFORM), Darwin)
21-
LT:=glibtool
21+
LIBTOOL:=glibtool
2222
else
23-
LT:=libtool
23+
LIBTOOL:=libtool
2424
endif
2525
endif
2626
ifeq ($(PLATFORM), CYGWIN)
2727
NO_UNDEFINED:=-no-undefined
2828
endif
29-
LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC)
30-
INSTALL_CMD = $(LT) --mode=install install
31-
UNINSTALL_CMD = $(LT) --mode=uninstall rm
29+
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC)
30+
INSTALL_CMD = $(LIBTOOL) --mode=install install
31+
UNINSTALL_CMD = $(LIBTOOL) --mode=uninstall rm
3232

3333
#Output filenames for various targets.
3434
ifndef LIBNAME
@@ -49,15 +49,15 @@ src/ciphers/aes/aes_enc.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c
4949
LOBJECTS = $(OBJECTS:.o=.lo)
5050

5151
$(LIBNAME): $(OBJECTS)
52-
$(LT) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
52+
$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
5353

5454
test: $(call print-help,test,Builds the library and the 'test' application to run all self-tests) $(LIBNAME) $(TOBJECTS)
55-
$(LT) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
55+
$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
5656

5757
# build the demos from a template
5858
define DEMO_template
5959
$(1): $(call print-help,$(1),Builds the library and the '$(1)' demo) demos/$(1).o $$(LIBNAME)
60-
$$(LT) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
60+
$$(LIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
6161
endef
6262

6363
$(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))

0 commit comments

Comments
 (0)