Merge pull request #4271 from elupus/depends_fix

depends: fix already installed check on osx

diff --git a/tools/depends/target/afpfs-ng/Makefile b/tools/depends/target/afpfs-ng/Makefile
index d664be8..1b6a664 100644 (file)
--- a/tools/depends/target/afpfs-ng/Makefile
+++ b/tools/depends/target/afpfs-ng/Makefile
@@ -16,7 +16,7 @@ export LIBS+=$(LINK_ICONV)
 CONFIGURE=./configure --prefix=$(PREFIX) \
   --disable-fuse
 
-LIBDYLIB=$(PLATFORM)/lib/.libs/libafpclient.so.0.0.0
+LIBDYLIB=$(PLATFORM)/lib/.libs/libafpclient.a
 
 all: .installed-$(PLATFORM)
 

diff --git a/tools/depends/target/libGLEW/Makefile b/tools/depends/target/libGLEW/Makefile
index 6ba67ed..57e89b7 100644 (file)
--- a/tools/depends/target/libGLEW/Makefile
+++ b/tools/depends/target/libGLEW/Makefile
@@ -13,7 +13,7 @@ endif
 export SYSTEM
 export GLEW_DEST=$(PREFIX)
 
-LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/lib/libGLEW.a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 

diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile
index c4b9ee7..80c2732 100644 (file)
--- a/tools/depends/target/libbluray/Makefile
+++ b/tools/depends/target/libbluray/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.bz2
 CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) \
   --disable-examples --disable-doxygen-doc
 
-LIBDYLIB=$(PLATFORM)/src/.libs/libbluray.so.1.0.0
+LIBDYLIB=$(PLATFORM)/src/.libs/libbluray.la
 
 all: .installed-$(PLATFORM)
 

diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile
index e30c549..16fec1b 100644 (file)
--- a/tools/depends/target/libcec/Makefile
+++ b/tools/depends/target/libcec/Makefile
@@ -10,7 +10,7 @@ ARCHIVE=$(SOURCE).tar.gz
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \
 
-LIBDYLIB=$(PLATFORM)/src/lib/.libs/libcec.so.2.0.1
+LIBDYLIB=$(PLATFORM)/src/lib/.libs/libcec.la
 
 all: .installed-$(PLATFORM)
 

diff --git a/tools/depends/target/libmodplug/Makefile b/tools/depends/target/libmodplug/Makefile
index 7aaa0de..31197eb 100644 (file)
--- a/tools/depends/target/libmodplug/Makefile
+++ b/tools/depends/target/libmodplug/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX)
 
-LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).so
+LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).la
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 

diff --git a/tools/depends/target/libplist/Makefile b/tools/depends/target/libplist/Makefile
index 3cdce19..d830cef 100644 (file)
--- a/tools/depends/target/libplist/Makefile
+++ b/tools/depends/target/libplist/Makefile
@@ -7,7 +7,11 @@ VERSION=1.6
 SOURCE=$(LIBNAME)-$(VERSION)
 FILENAME=v$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
+ifeq ($(findstring osx,x86-osx), osx)
+LIBDYLIB=$(PLATFORM)/build/src/libplist++.dylib
+else
 LIBDYLIB=$(PLATFORM)/build/src/libplist++.so
+endif
 CFLAGS+=-fvisibility=default
 all: .installed-$(PLATFORM)
 

diff --git a/tools/depends/target/libpng/Makefile b/tools/depends/target/libpng/Makefile
index b5ab12a..5467abf 100644 (file)
--- a/tools/depends/target/libpng/Makefile
+++ b/tools/depends/target/libpng/Makefile
@@ -12,7 +12,7 @@ ARCHIVE=$(SOURCE).tar.gz
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX) --disable-shared
 
-LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME)15.a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
 

diff --git a/tools/depends/target/libsdl/Makefile b/tools/depends/target/libsdl/Makefile
index 91a7a66..47c5fa2 100644 (file)
--- a/tools/depends/target/libsdl/Makefile
+++ b/tools/depends/target/libsdl/Makefile
@@ -13,7 +13,7 @@ ifneq ($(OS),linux)
 CONFIGURE += --without-x --disable-video-x11
 endif
 
-LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).so
+LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).a
 
 all: .installed-$(PLATFORM)
 

diff --git a/tools/depends/target/libshairplay/Makefile b/tools/depends/target/libshairplay/Makefile
index 751bee4..f86ce82 100644 (file)
--- a/tools/depends/target/libshairplay/Makefile
+++ b/tools/depends/target/libshairplay/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.bz2
 CONFIGURE=./configure --prefix=$(PREFIX)
 
 
-LIBDYLIB=$(PLATFORM)/src/lib/.libs/libshairplay.so.0.0.0
+LIBDYLIB=$(PLATFORM)/src/lib/.libs/libshairplay.a
 
 all: .installed-$(PLATFORM)
 

diff --git a/tools/depends/target/libxslt/Makefile b/tools/depends/target/libxslt/Makefile
index bd933ec..1ea6dba 100644 (file)
--- a/tools/depends/target/libxslt/Makefile
+++ b/tools/depends/target/libxslt/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX) --without-python --disable-shared   --with-debug --with-debugger --with-mem-debug --with-libxml-prefix=$(PREFIX)
 
-LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/$(LIBNAME)/.libs/$(LIBNAME).a
 
 CLEAN_FILES=$(ARCHIVE) $(PLATFORM)