remove openssl config option, add some fixes

diff --git a/config b/config
index a6e8fe9418367dc89126d38a85dec8c72b701297..eeeef937767d1047bc81efb23bb1646f4703c3eb 100755 (executable)
--- a/config
+++ b/config
@@ -56,11 +56,6 @@ CST_DRIVER_VERSION=master
 ### PART 2 # LIBRARIES # OPTIONAL #########################################################
 ###########################################################################################
 
-# if you want to build openssl (optional), define OPENSSL=yes:
-# OPENSSL=yes
-# OPENSSL=no
-OPENSSL=no
-
 # if you want to build libsigc++ (optional), define LIBSIGC=yes:
 # LIBSIGC=yes
 # LIBSIGC=no

diff --git a/make/drivers.mk b/make/drivers.mk
index ea93ce088032456553f849cc322cb607761c6641..cbc536d5c5702bff4c06a919b9bcdc968fc84d78 100755 (executable)
--- a/make/drivers.mk
+++ b/make/drivers.mk
@@ -41,7 +41,7 @@ $(D)/realtek-wireless-kernel-2.6.35.14-cnxt: $(D)/coolstream-kernel-2.6.35.14-cn
 $(D)/realtek-wireless-kernel-2.6.39.4-cnxt: $(D)/coolstream-kernel-2.6.39.4-cnxt $(D)/wpa_supplicant | $(TARGETPREFIX)
        touch $@
 
-$(D)/wpa_supplicant: $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz | $(TARGETPREFIX)
+$(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz | $(TARGETPREFIX)
        $(UNTAR)/wpa_supplicant-0.7.3.tar.gz
        pushd $(BUILD_TMP)/wpa_supplicant-0.7.3/wpa_supplicant && \
        cp -f defconfig .config && \

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 8a4e8692ef3372407be7c6dbfa82633e4cc7c238..0692adf7f60b6167e317a8a1417ea536d87519c2 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -67,15 +67,10 @@ $(TARGETPREFIX)/.version: $(TARGETPREFIX)/bin/neutrino
        echo "builddate=`cd $(SOURCE_DIR)/neutrino-hd && git log | grep "^commit" | wc -l` vom `date --reference=$(SOURCE_DIR)/neutrino-hd/.git`"               >> $@
 
 $(D)/neutrino-hd-libs:
-       if [ $(OPENSSL) = "yes" ]; then \
-               $(MAKE) $(D)/openssl; \
-       else \
-               true; \
-       fi
        if [ $(LIBSIGC) = "yes" ]; then \
                $(MAKE) $(D)/libsigc; \
        else \
                true; \
        fi
-       $(MAKE) $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libboost $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libvorbis $(D)/openthreads $(D)/luaposix
+       $(MAKE) $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libboost $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libvorbis $(D)/openthreads $(D)/luaposix
        touch $@