FIX: [droid] don't forward unknown keys

[vuplus_xbmc] / Makefile.include.in

diff --git a/Makefile.include.in b/Makefile.include.in
index b70245d..2afe6ba 100644 (file)
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -1,4 +1,4 @@
-AR=ar
+AR=@AR@
 ARFLAGS=crus
 RM=rm -rf
 SHELL=@SHELL@
@@ -28,18 +28,31 @@ dvidir=@dvidir@
 pdfdir=@pdfdir@
 psdir=@psdir@
 CXX=@CXX@
+CXX_FOR_BUILD=@CXX_FOR_BUILD@
 CC=@CC@
+CC_FOR_BUILD=@CC_FOR_BUILD@
 CXXFLAGS+=@CXXFLAGS@
+CXXFLAGS_FOR_BUILD+=@CXXFLAGS_FOR_BUILD@
 CFLAGS+=@CFLAGS@
+CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
 LDFLAGS+=@LDFLAGS@
-INCLUDES+=$(sort @INCLUDES@)
+LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
 INCLUDES+=-I@abs_top_srcdir@/lib
 INCLUDES+=-I@abs_top_srcdir@/xbmc
+INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
+INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
+INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
+INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
+INCLUDES+=$(sort @INCLUDES@)
 ifneq (@USE_EXTERNAL_FFMPEG@,1)
        INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
 endif
 INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
 INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+ifeq (@USE_OMXPLAYER@,1)
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/AudioEngine
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/AudioEngine/Utils
+endif
 DEFINES+= \
        @ARCH_DEFINES@ \
        -D_FILE_DEFINED \
@@ -50,7 +63,6 @@ DEFINES+= \
        @DEFS@ \
 
 ifeq ($(findstring osx,$(ARCH)), osx)
-       export MACOSX_DEPLOYMENT_TARGET=10.4
        INCLUDES+=-I@abs_top_srcdir@/xbmc/osx
 endif
 
@@ -122,7 +134,7 @@ GEN_DEPS=\
        && $(GEN_DEPS)
 
 
-.PHONY : lib pch clean distclean distclean_evil
+.PHONY : lib pch clean distclean distclean_evil check testsuite
 
 $(LIB): $(OBJS)
        $(SILENT_AR) $(AR) $(ARFLAGS) $(LIB) $(OBJS)
@@ -133,9 +145,11 @@ pch: $(PCH:.h=.h.gch)
 clean: 
        $(RM) $(OBJS) *.o $(LIB) $(SLIB) $(CLEAN_FILES) $(PCH:.h=.h.gch) $(DEPS)
        for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" clean); fi ); done
+       for d in $(CHECK_DIRS) $(GTEST_DIR); do if test -f $$d/Makefile; then $(MAKE) -C $$d $@; fi; done
 
 distclean:
        $(RM) $(OBJS) *.o $(LIB) $(SLIB) $(STATICLIB) $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PCH:.h=.h.gch) $(DEPS)
        for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" distclean || $(MAKE) -C "$$d" clean); fi ); done
+       for d in $(CHECK_DIRS) $(GTEST_DIR); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" $@ || $(MAKE) -C "$$d" clean); fi ); done
        if [ "$(shell pwd -P)" = "$(abs_top_srcdir)" ] || \
           [ "$(shell pwd)" = "$(abs_top_srcdir)" ]; then rm -f $(AUTOGENERATED_MAKEFILES) Makefile.include Makefile; fi