diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2014-11-17 10:18:14 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-11-18 23:08:04 +0100 |
| commit | 44d15563c706dce48f84b55bd299fc94c655f071 (patch) | |
| tree | f7d1044277227f9082ca228da6d6914ce9ce433b | |
| parent | ec52d2b7999b844f2e877dfcf43c43e25d63f895 (diff) | |
| download | buildroot-44d15563c706dce48f84b55bd299fc94c655f071.tar.gz buildroot-44d15563c706dce48f84b55bd299fc94c655f071.zip | |
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: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/live555/live555.mk | 21 | ||||
| -rw-r--r-- | package/mplayer/mplayer.mk | 2 | ||||
| -rw-r--r-- | package/vlc/vlc.mk | 9 |
3 files changed, 7 insertions, 25 deletions
diff --git a/package/live555/live555.mk b/package/live555/live555.mk index e933faaeae..8c31a08655 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -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 diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index dbde97767b..b2530e4a13 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -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 diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 7e81d590e5..e2c81d6e89 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -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 |
