rtsp-server: Use $(GST_NET_LIBS) / $(GST_NET_CFLAGS)

[platform/upstream/gstreamer.git] / gst / rtsp-server / Makefile.am

diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
index 2f9dfc6..4f6ea8f 100644 (file)
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -1,34 +1,42 @@
 public_headers = \
                rtsp-auth.h \
                rtsp-address-pool.h \
+               rtsp-context.h \
                rtsp-params.h \
                rtsp-sdp.h \
+               rtsp-thread-pool.h \
                rtsp-media.h \
                rtsp-media-factory.h \
                rtsp-media-factory-uri.h \
                rtsp-mount-points.h \
+               rtsp-permissions.h \
                rtsp-stream.h \
                rtsp-stream-transport.h \
                rtsp-session.h \
                rtsp-session-media.h \
                rtsp-session-pool.h \
+               rtsp-token.h \
                rtsp-client.h \
                rtsp-server.h
 
 c_sources = \
        rtsp-auth.c \
        rtsp-address-pool.c \
+       rtsp-context.c \
        rtsp-params.c \
        rtsp-sdp.c \
+       rtsp-thread-pool.c \
        rtsp-media.c \
        rtsp-media-factory.c \
        rtsp-media-factory-uri.c \
        rtsp-mount-points.c \
+       rtsp-permissions.c \
        rtsp-stream.c \
        rtsp-stream-transport.c \
        rtsp-session.c \
        rtsp-session-media.c \
        rtsp-session-pool.c \
+       rtsp-token.c \
        rtsp-client.c \
        rtsp-server.c
 
@@ -40,16 +48,16 @@ lib_LTLIBRARIES = \
 libgstrtspserver_@GST_API_VERSION@_la_SOURCES = \
     $(c_sources)
 
-libgstrtspserver_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtspserver_@GST_API_VERSION@_la_CFLAGS = \
+    $(GST_PLUGINS_BASE_CFLAGS) $(GST_NET_CFLAGS) \
+    $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstrtspserver_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 libgstrtspserver_@GST_API_VERSION@_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
+       $(GST_PLUGINS_BASE_LIBS) $(GST_NET_LIBS) $(GST_BASE_LIBS) \
     -lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
-            -lgstnet-@GST_API_VERSION@ \
             -lgstsdp-@GST_API_VERSION@ \
             -lgstapp-@GST_API_VERSION@ \
            $(GST_LIBS) $(GIO_LIBS) $(LIBM)
-libgstrtspserver_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static
 
 libgstrtspserver_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtsp-server
 libgstrtspserver_@GST_API_VERSION@include_HEADERS = $(public_headers)
@@ -61,26 +69,29 @@ BUILT_GIRSOURCES = GstRtspServer-@GST_API_VERSION@.gir
 
 gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_API_VERSION@include_HEADERS))
 gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_API_VERSION@_la_SOURCES))
-gir_cincludes=$(patsubst %,--c-include='gst/rtsp-server/%',$(libgstrtspinclude_HEADERS))
 
 GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@GST_API_VERSION@.la
        $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
                $(INTROSPECTION_SCANNER) -v --namespace GstRtspServer \
                --nsversion=@GST_API_VERSION@ \
                --strip-prefix=Gst \
+               --warn-all \
                -I$(top_srcdir) \
                -I$(top_builddir) \
                -DIN_GOBJECT_INTROSPECTION=1 \
-               --c-include='gst/gst.h' \
+               --c-include='gst/rtsp-server/rtsp-server.h' \
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_API_VERSION@` \
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_API_VERSION@` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-net-@GST_API_VERSION@` \
                --library=libgstrtspserver-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
                --include=GstRtsp-@GST_API_VERSION@ \
+               --include=GstNet-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-@GST_API_VERSION@ \
                --pkg gstreamer-rtsp-@GST_API_VERSION@ \
+               --pkg gstreamer-net-@GST_API_VERSION@ \
                --pkg-export gstreamer-rtsp-server-@GST_API_VERSION@ \
                --output $@ \
                $(gir_headers) \
@@ -103,6 +114,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
        --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_API_VERSION@` \
        --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_API_VERSION@` \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-net-@GST_API_VERSION@` \
        $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)