Permalink
Browse files

depends: fix already installed check on osx

Avoid depending on .so files which could be .dylib on osx
Fix some invalid dependencies
  • Loading branch information...
1 parent 7035048 commit 6df71eef95f7d52f128485fccf7aee2fb1b9c6f6 @elupus elupus committed Feb 23, 2014
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)

0 comments on commit 6df71ee

Please sign in to comment.