diff options
| -rw-r--r-- | package/live555/Config.in | 23 | ||||
| -rw-r--r-- | package/live555/live555.mk | 9 |
2 files changed, 1 insertions, 31 deletions
diff --git a/package/live555/Config.in b/package/live555/Config.in index 3823039540..5018296c2e 100644 --- a/package/live555/Config.in +++ b/package/live555/Config.in @@ -7,28 +7,5 @@ config BR2_PACKAGE_LIVE555 http://www.live555.com/liveMedia/ -if BR2_PACKAGE_LIVE555 - -config BR2_PACKAGE_LIVE555_OPENRTSP - bool "OpenRTSP" - default y - help - Live555 RTSP Client. - -config BR2_PACKAGE_LIVE555_MEDIASERVER - bool "live555MediaServer" - default y - help - RTSP Server. Supports numerous media formats such as H.264 and MPEG2. - -config BR2_PACKAGE_LIVE555_MPEG2_INDEXER - bool "MPEG2TransportStreamIndexer" - default y - help - MPEG2 Transport Stream Indexer. Provides indexes allowing 'trick play' - operation in the Live555MediaServer. - -endif - comment "live555 needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/live555/live555.mk b/package/live555/live555.mk index cbd1e851a0..f90d5a4626 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -44,19 +44,12 @@ define LIVE555_BUILD_CMDS $(MAKE) -C $(@D) all endef -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 $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install endef define LIVE555_INSTALL_TARGET_CMDS - for i in $(LIVE555_FILES_TO_INSTALL-y); do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i` || exit 1; \ - done + $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install endef $(eval $(generic-package)) |
