|
@@ -27,8 +27,12 @@ LIVE555_CFLAGS += -fPIC
|
|
|
endif
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
|
-LIVE555_DEPENDENCIES += openssl
|
|
|
-LIVE555_LIBS = -lssl -lcrypto
|
|
|
+LIVE555_DEPENDENCIES += host-pkgconf openssl
|
|
|
+LIVE555_CONSOLE_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
|
|
|
+# passed to ar for static linking, which gets confused by -L<dir>
|
|
|
+ifneq ($(BR2_STATIC_LIBS),y)
|
|
|
+LIVE555_LIVEMEDIA_LIBS = $(LIVE555_CONSOLE_LIBS)
|
|
|
+endif
|
|
|
else
|
|
|
LIVE555_CFLAGS += -DNO_OPENSSL
|
|
|
endif
|
|
@@ -48,8 +52,8 @@ define LIVE555_CONFIGURE_CMDS
|
|
|
# Must have a whitespace at the end of LIBRARY_LINK, otherwise static link
|
|
|
# fails
|
|
|
echo 'LIBRARY_LINK = $(LIVE555_LIBRARY_LINK) ' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
|
|
|
- echo 'LIBS_FOR_CONSOLE_APPLICATION = $(LIVE555_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
|
|
|
- echo 'LIBS_FOR_LIVEMEDIA_LIB = $(LIVE555_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
|
|
|
+ echo 'LIBS_FOR_CONSOLE_APPLICATION = $(LIVE555_CONSOLE_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
|
|
|
+ echo 'LIBS_FOR_LIVEMEDIA_LIB = $(LIVE555_LIVEMEDIA_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
|
|
|
(cd $(@D); ./genMakefiles $(LIVE555_CONFIG_TARGET))
|
|
|
endef
|
|
|
|