[depends] fix LIBDYLIB definitions

16 files changed, 26 insertions, 15 deletions

diff --git a/tools/depends/native/JsonSchemaBuilder/Makefile b/tools/depends/native/JsonSchemaBuilder/Makefile
index 1ca16a1208..78c44339c4 100644
--- a/tools/depends/native/JsonSchemaBuilder/Makefile
+++ b/tools/depends/native/JsonSchemaBuilder/Makefile
@@ -18,7 +18,7 @@ endif
 SOURCE=$(ROOT_DIR)/src
 
 CONFIGURE=./configure --prefix=$(PREFIX)
-APP=$(SOURCE)/JsonSchemaBuilder
+APP=$(PLATFORM)/JsonSchemaBuilder
 APPBIN=$(PREFIX)/bin/JsonSchemaBuilder
 
 all: .installed-$(PLATFORM)
diff --git a/tools/depends/native/automake-native/Makefile b/tools/depends/native/automake-native/Makefile
index dea405b589..bdeaf34fa8 100644
--- a/tools/depends/native/automake-native/Makefile
+++ b/tools/depends/native/automake-native/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
 # configuration settings
 CONFIGURE=./configure --prefix=$(NATIVEPREFIX)
 
-LIBDYLIB=$(PLATFORM)/automake
+LIBDYLIB=$(PLATFORM)/bin/automake
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
diff --git a/tools/depends/native/libpng-native/Makefile b/tools/depends/native/libpng-native/Makefile
index a1d9572e01..b226c761d0 100644
--- a/tools/depends/native/libpng-native/Makefile
+++ b/tools/depends/native/libpng-native/Makefile
@@ -13,7 +13,7 @@ ARCHIVE=$(SOURCE).tar.gz
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX)
 
-LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME)16.a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
diff --git a/tools/depends/native/python27-native/Makefile b/tools/depends/native/python27-native/Makefile
index 6cc75be8bb..582f40a28f 100644
--- a/tools/depends/native/python27-native/Makefile
+++ b/tools/depends/native/python27-native/Makefile
@@ -13,6 +13,9 @@ HOSTPYTHONDIR=$(CWD)/$(PLATFORM)/hostpython
 CONFIGURE=./configure --prefix=$(NATIVEPREFIX) --disable-shared --disable-toolbox-glue --disable-framework
 
 LIBDYLIB=$(PLATFORM)/python
+ifeq ($(NATIVE_OS), osx)
+	LIBDYLIB=$(PLATFORM)/python.exe
+endif
 
 all: .installed-$(PLATFORM)
 
diff --git a/tools/depends/native/tar-native/Makefile b/tools/depends/native/tar-native/Makefile
index 0936344bd2..ea72e2ec4e 100644
--- a/tools/depends/native/tar-native/Makefile
+++ b/tools/depends/native/tar-native/Makefile
@@ -21,7 +21,7 @@ CONFIGURE=./configure --prefix=$(PREFIX) \
   --disable-dependency-tracking ac_cv_func_fdopendir=no \
   $(PLATFORM_CONFIGURE)
 
-APP=$(SOURCE)/src/tar
+APP=$(PLATFORM)/src/tar
 APPBIN=$(PREFIX)/bin/tar
 
 all: .installed-$(PLATFORM)
diff --git a/tools/depends/native/xz-native/Makefile b/tools/depends/native/xz-native/Makefile
index 4c9efa7801..c6c2bf7a8b 100644
--- a/tools/depends/native/xz-native/Makefile
+++ b/tools/depends/native/xz-native/Makefile
@@ -13,7 +13,7 @@ export LIBTOOL=builds/unix/libtool
 export PATH:=$(PREFIX)/bin:$(PATH)
 CONFIGURE=./configure --prefix=$(PREFIX)
 
-APP=$(SOURCE)/src/xz/xz
+APP=$(PLATFORM)/src/xz/xz
 
 all: .installed-$(PLATFORM)
 
diff --git a/tools/depends/target/dbus/Makefile b/tools/depends/target/dbus/Makefile
index 517252c51a..2fab9f49a1 100644
--- a/tools/depends/target/dbus/Makefile
+++ b/tools/depends/target/dbus/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
 CONFIGURE=./configure --prefix=$(PREFIX) \
   --without-x --disable-xml-docs --disable-doxygen-docs
 
-LIBDYLIB=$(PLATFORM)/$(LIBNAME)/.libs/$(LIBNAME).so
+LIBDYLIB=$(PLATFORM)/$(LIBNAME)/.libs/lib$(LIBNAME)-1.so
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
diff --git a/tools/depends/target/expat/Makefile b/tools/depends/target/expat/Makefile
index 7e38b16c9f..7af2cca97a 100644
--- a/tools/depends/target/expat/Makefile
+++ b/tools/depends/target/expat/Makefile
@@ -10,7 +10,7 @@ ARCHIVE=$(SOURCE).tar.bz2
 # configuration settings
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) ./conftools; ./configure --prefix=$(PREFIX) --disable-shared
 
-LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile
index fbfd236f3b..11793a7769 100644
--- a/tools/depends/target/libbluray/Makefile
+++ b/tools/depends/target/libbluray/Makefile
@@ -12,7 +12,7 @@ CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) \
   --disable-examples --disable-doxygen-doc \
   --disable-bdjava-jar --without-libxml2 --without-freetype
 
-LIBDYLIB=$(PLATFORM)/src/.libs/libbluray.la
+LIBDYLIB=$(PLATFORM)/.libs/libbluray.la
 
 all: .installed-$(PLATFORM)
 
diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile
index 5d8bdaf4ff..181180d868 100644
--- a/tools/depends/target/libcec/Makefile
+++ b/tools/depends/target/libcec/Makefile
@@ -11,7 +11,10 @@ VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
-LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME).la
+LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME)/$(LIBNAME).so
+ifeq (darwin, $(findstring darwin, $(HOST)))
+	LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME)/$(LIBNAME).dylib
+endif
 
 all: .installed-$(PLATFORM)
 
diff --git a/tools/depends/target/libmicrohttpd/Makefile b/tools/depends/target/libmicrohttpd/Makefile
index fda5f986dd..69c5e98fc0 100644
--- a/tools/depends/target/libmicrohttpd/Makefile
+++ b/tools/depends/target/libmicrohttpd/Makefile
@@ -13,7 +13,7 @@ CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
             --disable-doc --disable-examples --disable-curl \
             --disable-spdy
 
-LIBDYLIB=$(PLATFORM)/src/daemon/.libs/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/src/microhttpd/.libs/$(LIBNAME).a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
diff --git a/tools/depends/target/libpng/Makefile b/tools/depends/target/libpng/Makefile
index 47781cff43..20a06bb39b 100644
--- a/tools/depends/target/libpng/Makefile
+++ b/tools/depends/target/libpng/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX) --disable-shared
 
-LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME)15.a
+LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME)16.a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 
diff --git a/tools/depends/target/p8-platform/Makefile b/tools/depends/target/p8-platform/Makefile
index d5918d7ac5..257f7e0561 100644
--- a/tools/depends/target/p8-platform/Makefile
+++ b/tools/depends/target/p8-platform/Makefile
@@ -7,7 +7,7 @@ VERSION=2.1.0.1
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
-LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/build/lib$(LIBNAME).a
 
 all: .installed-$(PLATFORM)
 
diff --git a/tools/depends/target/platform/Makefile b/tools/depends/target/platform/Makefile
index f51588cafb..8dd310665f 100644
--- a/tools/depends/target/platform/Makefile
+++ b/tools/depends/target/platform/Makefile
@@ -7,7 +7,7 @@ VERSION=1.0.10
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
-LIBDYLIB=$(PLATFORM)/build/src/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/build/lib$(LIBNAME).a
 
 all: .installed-$(PLATFORM)
 
diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile
index 9a83544201..addd67498c 100644
--- a/tools/depends/target/pythonmodule-pil/Makefile
+++ b/tools/depends/target/pythonmodule-pil/Makefile
@@ -25,9 +25,11 @@ LDSHARED:=$(CC) -bundle -undefined dynamic_lookup $(LDFLAGS)
 CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/" LDSHARED="$(LDSHARED)"
 endif
 
-LIBDYLIB=$(PLATFORM)/dist/PIL-$(VERSION)-py2.7-$(OS)-$(CPU).egg
+LIBDYLIB=$(PLATFORM)/dist/Pillow-$(VERSION)-py2.7-$(OS)-$(CPU).egg
 ifeq ($(OS),android)
 LIBDYLIB=$(PREFIX)/share/$(APP_NAME)/addons/script.module.pil/lib/PIL/_imaging.so
+else ifeq (darwin, $(findstring darwin, $(HOST)))
+LIBDYLIB=$(PLATFORM)/dist/Pillow-$(VERSION)-py2.7-macosx-10.4-x86_64.egg
 endif
 
 all: .installed-$(PLATFORM)
diff --git a/tools/depends/target/pythonmodule-pycryptodome/Makefile b/tools/depends/target/pythonmodule-pycryptodome/Makefile
index 1b54ba1ed2..2c53295eb4 100644
--- a/tools/depends/target/pythonmodule-pycryptodome/Makefile
+++ b/tools/depends/target/pythonmodule-pycryptodome/Makefile
@@ -24,7 +24,10 @@ LDSHARED:=$(CC) -bundle -undefined dynamic_lookup $(LDFLAGS)
 CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/" LDSHARED="$(LDSHARED)"
 endif
 
-LIBDYLIB=$(PLATFORM)/dist/$(LIBNAME)-$(VERSION)-py2.7.egg
+LIBDYLIB=$(PLATFORM)/build/lib.$(OS)-$(CPU)-2.7/Cryptodome
+ifeq ($(NATIVE_OS), osx)
+	LIBDYLIB=$(PLATFORM)/build/lib.macosx-10.4-x86_64-2.7/Cryptodome
+endif
 
 all: .installed-$(PLATFORM)