autotools: fix linking issues

For some reason libtool would pull in the wrong libgstapp version
from the system if we don't specify this rtsp-server internal
dep explicitly. Unclear why this happens, but should be fine to
brute force it. Also fix some ordering issues.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/165>

5 files changed, 7 insertions, 21 deletions

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 38d8837..4466c70 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -93,7 +93,7 @@ extra_files =
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = -I$(top_srcdir) $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
-GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_PLUGINS_BASE_LIBS) \
+GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_PLUGINS_BASE_LIBS) -lgstapp-1.0 -lgstrtsp-1.0 -lgstsdp-1.0 \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(GCOV_LIBS)
 
 # If you need to override some of the declarations, place them in this file
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6cbe72a..b531f6a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,19 +8,13 @@ noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme \
 #INCLUDES = -I$(top_srcdir) -I$(srcdir)
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS)
-LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS)
+LDADD = $(GST_OBJ_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstapp-1.0 -lgstsdp-1.0 -lgstrtsp-1.0 $(GIO_LIBS)
 
 if HAVE_LIBCGROUP
 noinst_PROGRAMS += test-cgroups
 LDADD += $(LIBCGROUP_LIBS)
 endif
 
-test_appsrc2_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS)
-test_appsrc2_LDADD = \
-	$(LDADD) \
-	$(GST_PLUGINS_BASE_LIBS) -lgstapp-1.0
 test_netclock_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(GST_NET_CFLAGS)
@@ -34,11 +28,3 @@ test_netclock_client_CFLAGS = \
 test_netclock_client_LDADD = \
 	$(LDADD) \
 	$(GST_NET_LIBS)
-
-test_onvif_backchannel_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS)
-test_onvif_backchannel_LDADD = \
-	$(LDADD) \
-	$(GST_PLUGINS_BASE_LIBS) -lgstrtsp-1.0 -lgstsdp-1.0
-
diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
index 112e529..261501f 100644
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -65,10 +65,11 @@ libgstrtspserver_@GST_API_VERSION@_la_CFLAGS = \
     $(GST_BASE_CFLAGS) $(GST_CFLAGS) -DBUILDING_GST_RTSP_SERVER
 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_NET_LIBS) $(GST_BASE_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) \
     -lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
             -lgstsdp-@GST_API_VERSION@ \
             -lgstapp-@GST_API_VERSION@ \
+	    $(GST_NET_LIBS) $(GST_BASE_LIBS) \
 	    $(GST_LIBS) $(GIO_LIBS) $(LIBM)
 
 libgstrtspserver_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtsp-server
@@ -106,6 +107,7 @@ GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@
 		--pkg gstreamer-@GST_API_VERSION@ \
 		--pkg gstreamer-rtsp-@GST_API_VERSION@ \
 		--pkg gstreamer-net-@GST_API_VERSION@ \
+		--pkg gstreamer-app-@GST_API_VERSION@ \
 		--pkg-export gstreamer-rtsp-server-@GST_API_VERSION@ \
 		--output $@ \
 		$(gir_headers) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f653107..2e7d99f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,9 +2,7 @@ noinst_PROGRAMS = test-cleanup test-reuse
 
 AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
-AM_LDFLAGS = \
-	$(GST_LIBS) \
-	$(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la
+LDADD = $(GST_OBJ_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstapp-1.0 -lgstsdp-1.0 -lgstrtsp-1.0
 
 SUBDIRS = check
 
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 574297c..1c6119d 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -56,7 +56,7 @@ AM_CXXFLAGS = $(GST_CXXFLAGS) $(GST_CHECK_CFLAGS) \
 	-DGST_CHECK_TEST_ENVIRONMENT_BEACON="\"GST_PLUGIN_LOADING_WHITELIST\"" \
 	-UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
 LDADD = $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ -lgstapp-@GST_API_VERSION@ \
 	-lgstrtsp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GIO_LIBS) \
 	$(GST_LIBS) $(GST_CHECK_LIBS) $(GST_RTSP_SERVER_LIBS)