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 bbae027..4f6ea8f 100644 (file)
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -48,12 +48,13 @@ 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)
@@ -68,7 +69,6 @@ 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)" \
@@ -79,7 +79,7 @@ GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@
                -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@` \