Commit 44d15563 authored by Baruch Siach's avatar Baruch Siach Committed by Thomas Petazzoni
Browse files

live555: use upstream install target for staging installation 



Move include directories out of $(STAGING_DIR)/usr/include/live. This is
upstream choice, and is consistent with e.g. Debian. Update mplayer and vlc to
match.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent ec52d2b7

package/live555/live555.mk

+2 −19
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ define LIVE555_CONFIGURE_CMDS 
	echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux

	echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux

	echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux

	echo 'PREFIX = /usr' >> $(@D)/config.linux

	(cd $(@D); ./genMakefiles linux)

endef
@@ -30,31 +31,13 @@ define LIVE555_BUILD_CMDS 
	$(MAKE) -C $(@D) all

endef



LIVE555_HEADERS_TO_INSTALL = \

	liveMedia/include \

	groupsock/include \

	UsageEnvironment/include \

	BasicUsageEnvironment/include



LIVE555_LIBS_TO_INSTALL = \

	liveMedia/libliveMedia.a \

	groupsock/libgroupsock.a \

	UsageEnvironment/libUsageEnvironment.a \

	BasicUsageEnvironment/libBasicUsageEnvironment.a



LIVE555_FILES_TO_INSTALL-y =

LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP

LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live555MediaServer

LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer



define LIVE555_INSTALL_STAGING_CMDS

	for i in $(LIVE555_HEADERS_TO_INSTALL); do \

		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \

		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \

	done; \

	for i in $(LIVE555_LIBS_TO_INSTALL); do \

		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \

	done

	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install

endef



define LIVE555_INSTALL_TARGET_CMDS

package/mplayer/mplayer.mk

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ MPLAYER_DEPENDENCIES += live555 
MPLAYER_CONF_OPTS += --enable-live

MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment

MPLAYER_CFLAGS += \

	$(addprefix -I$(STAGING_DIR)/usr/include/live/,$(MPLAYER_LIVE555))

	$(addprefix -I$(STAGING_DIR)/usr/include/,$(MPLAYER_LIVE555))

MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++

else

MPLAYER_CONF_OPTS += --disable-live

package/vlc/vlc.mk

+4 −5
Original line number Diff line number Diff line
@@ -231,11 +231,10 @@ VLC_CONF_OPTS += --enable-live555 
VLC_DEPENDENCIES += live555

VLC_CONF_ENV += \

	LIVE555_CFLAGS="\

		-I$(STAGING_DIR)/usr/include/live \

		-I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \

		-I$(STAGING_DIR)/usr/include/live/groupsock \

		-I$(STAGING_DIR)/usr/include/live/liveMedia \

		-I$(STAGING_DIR)/usr/include/live/UsageEnvironment \

		-I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \

		-I$(STAGING_DIR)/usr/include/groupsock \

		-I$(STAGING_DIR)/usr/include/liveMedia \

		-I$(STAGING_DIR)/usr/include/UsageEnvironment \

		" \

	LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"

else