diff options
| author | phintuka <phintuka> | 2010-06-11 20:16:33 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2010-06-11 20:16:33 +0000 |
| commit | 51d91729c37e31c2eb46e128a5062026ac1569a8 (patch) | |
| tree | 8fdc490782ca682df41e3f9fc14b935211aeccfa | |
| parent | ad032ed6ad3955c51f60c5529272addea989a8fa (diff) | |
| download | xineliboutput-51d91729c37e31c2eb46e128a5062026ac1569a8.tar.gz xineliboutput-51d91729c37e31c2eb46e128a5062026ac1569a8.tar.bz2 | |
Use pkg-config for libbluray (requires r326 or later)
| -rw-r--r-- | xine/BluRay/Makefile | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/xine/BluRay/Makefile b/xine/BluRay/Makefile index a67cb6fd..c202c136 100644 --- a/xine/BluRay/Makefile +++ b/xine/BluRay/Makefile @@ -1,17 +1,13 @@ # -# deps -# - -BLURAY_INC_DIR ?= /usr/src/libbluray/src/ - -# # select plugins # ENABLE_DEMUX_PLUGIN ?= yes -ifeq ($(shell grep BLURAY $(BLURAY_INC_DIR)/bluray.h > /dev/null && echo yes), yes) +ifeq ($(shell PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config libbluray && echo yes), yes) ENABLE_INPUT_PLUGIN ?= yes + CFLAGS_BD ?= $(shell PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config libbluray --cflags) + LIBS_BD ?= $(shell PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ pkg-config libbluray --libs) else ENABLE_INPUT_PLUGIN ?= no $(warning libbluray not found) @@ -42,9 +38,6 @@ CFLAGS += $(shell pkg-config libxine --cflags) CFLAGS += $(CFLAGS_BD) INSTALL = install -ifeq ($(ENABLE_INPUT_PLUGIN), yes) -CFLAGS_BD ?= -I$(BLURAY_INC_DIR) -endif # # linker options @@ -53,10 +46,6 @@ endif LIBS_XINE = $(shell pkg-config libxine --libs) LDFLAGS += -shared -fvisibility=hidden -ifeq ($(ENABLE_INPUT_PLUGIN), yes) -LIBS_BD ?= -L/usr/local/lib -lbluray -endif - # # targets # |