Skip to content

Commit

Permalink
depends: fix already installed check on osx
Browse files Browse the repository at this point in the history
Avoid depending on .so files which could be .dylib on osx
Fix some invalid dependencies
  • Loading branch information
elupus committed Feb 23, 2014
1 parent 7035048 commit 6df71ee
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tools/depends/target/afpfs-ng/Makefile
Expand Up @@ -16,7 +16,7 @@ export LIBS+=$(LINK_ICONV)
CONFIGURE=./configure --prefix=$(PREFIX) \ CONFIGURE=./configure --prefix=$(PREFIX) \
--disable-fuse --disable-fuse


LIBDYLIB=$(PLATFORM)/lib/.libs/libafpclient.so.0.0.0 LIBDYLIB=$(PLATFORM)/lib/.libs/libafpclient.a


all: .installed-$(PLATFORM) all: .installed-$(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libGLEW/Makefile
Expand Up @@ -13,7 +13,7 @@ endif
export SYSTEM export SYSTEM
export GLEW_DEST=$(PREFIX) export GLEW_DEST=$(PREFIX)


LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a LIBDYLIB=$(PLATFORM)/lib/libGLEW.a


CLEAN_FILES=$(ARCHIVE) $(PLATFORM) CLEAN_FILES=$(ARCHIVE) $(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libbluray/Makefile
Expand Up @@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.bz2
CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) \ CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) \
--disable-examples --disable-doxygen-doc --disable-examples --disable-doxygen-doc


LIBDYLIB=$(PLATFORM)/src/.libs/libbluray.so.1.0.0 LIBDYLIB=$(PLATFORM)/src/.libs/libbluray.la


all: .installed-$(PLATFORM) all: .installed-$(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libcec/Makefile
Expand Up @@ -10,7 +10,7 @@ ARCHIVE=$(SOURCE).tar.gz
# configuration settings # configuration settings
CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \ 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) all: .installed-$(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libmodplug/Makefile
Expand Up @@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
./configure --prefix=$(PREFIX) ./configure --prefix=$(PREFIX)


LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).so LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).la


CLEAN_FILES=$(ARCHIVE) $(PLATFORM) CLEAN_FILES=$(ARCHIVE) $(PLATFORM)


Expand Down
4 changes: 4 additions & 0 deletions tools/depends/target/libplist/Makefile
Expand Up @@ -7,7 +7,11 @@ VERSION=1.6
SOURCE=$(LIBNAME)-$(VERSION) SOURCE=$(LIBNAME)-$(VERSION)
FILENAME=v$(VERSION) FILENAME=v$(VERSION)
ARCHIVE=$(SOURCE).tar.gz ARCHIVE=$(SOURCE).tar.gz
ifeq ($(findstring osx,x86-osx), osx)
LIBDYLIB=$(PLATFORM)/build/src/libplist++.dylib
else
LIBDYLIB=$(PLATFORM)/build/src/libplist++.so LIBDYLIB=$(PLATFORM)/build/src/libplist++.so
endif
CFLAGS+=-fvisibility=default CFLAGS+=-fvisibility=default
all: .installed-$(PLATFORM) all: .installed-$(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libpng/Makefile
Expand Up @@ -12,7 +12,7 @@ ARCHIVE=$(SOURCE).tar.gz
CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
./configure --prefix=$(PREFIX) --disable-shared ./configure --prefix=$(PREFIX) --disable-shared


LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME)15.a


CLEAN_FILES=$(ARCHIVE) $(PLATFORM) CLEAN_FILES=$(ARCHIVE) $(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libsdl/Makefile
Expand Up @@ -13,7 +13,7 @@ ifneq ($(OS),linux)
CONFIGURE += --without-x --disable-video-x11 CONFIGURE += --without-x --disable-video-x11
endif endif


LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).so LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).a


all: .installed-$(PLATFORM) all: .installed-$(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libshairplay/Makefile
Expand Up @@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.bz2
CONFIGURE=./configure --prefix=$(PREFIX) CONFIGURE=./configure --prefix=$(PREFIX)




LIBDYLIB=$(PLATFORM)/src/lib/.libs/libshairplay.so.0.0.0 LIBDYLIB=$(PLATFORM)/src/lib/.libs/libshairplay.a


all: .installed-$(PLATFORM) all: .installed-$(PLATFORM)


Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/libxslt/Makefile
Expand Up @@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.gz
CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ 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) ./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) CLEAN_FILES=$(ARCHIVE) $(PLATFORM)


Expand Down

0 comments on commit 6df71ee

Please sign in to comment.