From f85dca8906627cf2df32fcc0db77c7aee1fa811b Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 26 Sep 2013 15:16:01 +0200 Subject: [PATCH] Enable RTSP build as a plugin --- Makefile.in | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 7b89acdb3..2194578bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -487,6 +487,7 @@ portaudio: @PORTAUDIO_PLAY_LIB_TARGET@ @PORTAUDIO_CAP_LIB_TARGET@ jack: @JACK_CAP_LIB_TARGET@ @JACK_PLAY_LIB_TARGET@ scale: @SCALE_LIB_TARGET@ libavcodec: @LIBAVCODEC_DECOMPRESS_LIB_TARGET@ @LIBAVCODEC_COMPRESS_LIB_TARGET@ @LIBAVCODEC_AUDIO_CODEC_LIB_TARGET@ +rtsp: @RTSP_LIB_TARGET@ @SDL_LIB_TARGET@: @SDL_OBJ@ @X_OBJ@ mkdir -p lib/ultragrid @@ -496,6 +497,10 @@ libavcodec: @LIBAVCODEC_DECOMPRESS_LIB_TARGET@ @LIBAVCODEC_COMPRESS_LIB_TARGET@ mkdir -p lib/ultragrid $(LINKER) $(LDFLAGS) -shared -Wl,-soname,display_gl.so.@video_display_abi_version@ $^ @GL_LIB@ -o $@ +@RTSP_LIB_TARGET@: @RTSP_OBJ@ + mkdir -p lib/ultragrid + $(LINKER) $(LDFLAGS) -shared -Wl,-soname,vidcap_rtsp.so.@video_capture_abi_version@ $^ @RTSP_LIB@ -o $@ + @TESTCARD_LIB_TARGET@: @TESTCARD_COMMON@ @TESTCARD_OBJ@ mkdir -p lib/ultragrid $(LINKER) $(LDFLAGS) -shared -Wl,-soname,vidcap_testcard.so.@video_capture_abi_version@ $^ @TESTCARD_LIB@ -o $@ diff --git a/configure.ac b/configure.ac index e0a7c0475..50f63ac12 100644 --- a/configure.ac +++ b/configure.ac @@ -1255,7 +1255,8 @@ case $host in RTSP_INC= RTSP_LIB="${GLIB_LIBS} ${CURL_LIBS}" RTSP_OBJ="src/video_capture/rtsp.o src/rtp/rtpdec_h264.o" - #LIB_TARGETS not needed here since we are not building modules on Mac + AC_SUBST(RTSP_LIB_TARGET, "lib/ultragrid/vidcap_rtsp.so.$video_capture_abi_version") + LIB_TARGETS="$LIB_TARGETS $RTSP_LIB_TARGET" LIB_OBJS="$LIB_OBJS $RTSP_OBJ" rtsp=yes curl=yes