mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

live555: use upstream install target for staging installation

Browse Source 
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: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Baruch Siach
2014-11-17 10:18:14 +02:00
committed by Thomas Petazzoni
parent ec52d2b799
commit 44d15563c7
3 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
package/live555/live555.mk
View File

@@ -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