Browse Source

TGTLIBTOOL wasn't always defined

Steffen Jaeckel 6 years ago
parent
commit
4b3ef78901
1 changed files with 10 additions and 7 deletions
  1. 10 7
      makefile.shared

+ 10 - 7
makefile.shared

@@ -18,19 +18,22 @@ PLATFORM := $(shell uname | sed -e 's/_.*//')
 
 
 ifeq ($(LIBTOOL),rlibtool)
 ifeq ($(LIBTOOL),rlibtool)
   TGTLIBTOOL:=slibtool-shared
   TGTLIBTOOL:=slibtool-shared
-endif
-
-ifndef LIBTOOL
-  ifeq ($(PLATFORM), Darwin)
-    LIBTOOL:=glibtool
+else
+  ifndef LIBTOOL
+    ifeq ($(PLATFORM), Darwin)
+      TGTLIBTOOL:=glibtool
+    else
+      TGTLIBTOOL:=libtool
+    endif
   else
   else
-    LIBTOOL:=libtool
+    TGTLIBTOOL=$(LIBTOOL)
   endif
   endif
-  TGTLIBTOOL=$(LIBTOOL)
 endif
 endif
+
 ifeq ($(PLATFORM), CYGWIN)
 ifeq ($(PLATFORM), CYGWIN)
   NO_UNDEFINED:=-no-undefined
   NO_UNDEFINED:=-no-undefined
 endif
 endif
+
 LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC)
 LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC)
 INSTALL_CMD = $(TGTLIBTOOL) --mode=install install
 INSTALL_CMD = $(TGTLIBTOOL) --mode=install install
 UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm
 UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm