libcoolstream.mk: possibility tu use own libcool

diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk
index 23214321a67009fefc8623a026d276eaa119660a..bfdd15892c74277023765fea9e9b8ba1e4d89f35 100644 (file)
--- a/make/libcoolstream.mk
+++ b/make/libcoolstream.mk
@@ -4,7 +4,13 @@ else
 LIBCS_DEBUG            = off
 endif
 
+ifeq ($(USE_OWN_LIBCOOL), yes)
+LIBCS_BASE             = $(BASE_DIR)/../library-coolstream
+else
 LIBCS_BASE             = $(SOURCE_DIR)/library-coolstream
+endif
+
+
 #LIBCS_BASE            = $(HOME)/libcoolstream
 EXTRA_INCLUDE_PATH     = -I$(TARGETPREFIX)/include
 EXTRA_LIBRARY_PATH     = -L$(TARGETPREFIX)/lib
@@ -52,8 +58,8 @@ libcoolstream:
                        LOCAL_CXXFLAGS="$(LOCAL_CXXFLAGS)" \
                        LOCAL_LDFLAGS="$(LOCAL_LDFLAGS)" \
                        $(LIBCS_BUILDARGS)
-       @echo "INSTALL libcoolstream-mt.* => $(LIBCS_INSTALL_DIR)"
-#      @cp -frd $(BUILD_TMP)/$(LIBCS_BUILD_DIR)/libcoolstream-mt.* $(LIBCS_INSTALL_DIR)
+       @echo "INSTALL libcoolstream.* => $(LIBCS_INSTALL_DIR)"
+       @cp -frd $(LIBCS_BUILD_DIR)/libcoolstream.* $(LIBCS_INSTALL_DIR)
 
 ifeq ($(PLATFORM), nevis)
 libnxp:

diff --git a/make/neutrino.mk b/make/neutrino.mk
index aabc12b69a8b622fb575d0bd5a2bb63cf688aebb..e7ac2b3d933098e69c0426effc8d6ccea6568826 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -96,12 +96,12 @@ endif
 
 N_CONFIGURE_LIBSTB_HAL =
 ifeq ($(BOXTYPE), coolstream)
-  ifeq ($(HAS_LIBCOOLSTREAM),yes)
+  ifeq ($(HAS_LIBCOOLSTREAM), yes)
     NEUTRINO_DEPS += libcoolstream
-    ifeq ($(DEBUG),yes)
+    ifeq ($(DEBUG), yes)
       N_CONFIG_OPTS += \
-       --enable-libcoolstream-static \
-       --with-libcoolstream-static-dir=$(BUILD_TMP)/libcoolstream
+      --enable-libcoolstream-static \
+      --with-libcoolstream-static-dir=$(BUILD_TMP)/libcoolstream
     endif
   endif
 else