diff --git a/bridge/Makefile.am b/bridge/Makefile.am index 6e10d7ac..385c33e8 100644 --- a/bridge/Makefile.am +++ b/bridge/Makefile.am @@ -16,7 +16,6 @@ AM_CFLAGS = \ -Wall \ -Wextra \ -Werror \ - -pedantic \ $(DEBUG_CFLAGS) lib_LTLIBRARIES = libopenwebrtc_bridge.la @@ -37,7 +36,8 @@ libopenwebrtc_bridge_la_LDFLAGS = -export-dynamic bin_PROGRAMS = daemon daemon_SOURCES = daemon.c -daemon_LDFLAGS = -static -export-dynamic $(SEED_LIBS) libopenwebrtc_bridge.la +daemon_LDFLAGS = -static -export-dynamic $(SEED_LIBS) +daemon_LDADD = libopenwebrtc_bridge.la includedir = $(prefix)/include/owr include_HEADERS = \ diff --git a/configure.ac b/configure.ac index 11ec1b50..cf624d17 100644 --- a/configure.ac +++ b/configure.ac @@ -11,18 +11,19 @@ AM_INIT_AUTOMAKE([1.11 -Wno-portability]) AM_SILENT_RULES([yes]) AC_PROG_CC +AC_PROG_CC_STDC LT_INIT LIBOPENWEBRTC_CFLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_DISABLE_DEPRECATION_WARNINGS" AC_SUBST(LIBOPENWEBRTC_CFLAGS) +GST_REQUIRED=1.4 PKG_CHECK_MODULES(GLIB, [glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0]) -PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.0.10 gstreamer-rtp-1.0 >= 1.0.10]) -PKG_CHECK_MODULES(NICE, [nice >= 0.1.4]) +PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= $GST_REQUIRED gstreamer-rtp-1.0 >= $GST_REQUIRED gstreamer-video-1.0 >= $GST_REQUIRED gstreamer-app-1.0 >= $GST_REQUIRED]) +PKG_CHECK_MODULES(NICE, [nice >= 0.1.7.1]) PKG_CHECK_MODULES(ORC, [orc-0.4]) PKG_CHECK_MODULES(SEED, [seed]) -PKG_CHECK_MODULES(OPENWEBRTC_GST_PLUGINS, [openwebrtc-gst-plugins]) # check for gobject-introspection m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ diff --git a/local/Makefile.am b/local/Makefile.am index 10a4a1d0..4bab4a76 100644 --- a/local/Makefile.am +++ b/local/Makefile.am @@ -9,11 +9,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/owr AM_CFLAGS = \ - -ansi \ -Wall \ -Wextra \ - -Werror \ - -pedantic + -Werror noinst_LTLIBRARIES = libopenwebrtc_local.la diff --git a/local/owr_local_media_source.c b/local/owr_local_media_source.c index ec2c9e33..d03e3d23 100644 --- a/local/owr_local_media_source.c +++ b/local/owr_local_media_source.c @@ -293,7 +293,7 @@ static GstPad *owr_local_media_source_get_pad(OwrMediaSource *media_source, GstC OwrLocalMediaSource *local_source; OwrLocalMediaSourcePrivate *priv; GstElement *source_bin, *post_tee_bin; - GstElement *source, *capsfilter = NULL, *tee; + GstElement *source = NULL, *capsfilter = NULL, *tee; GstPad *ghostpad = NULL; gchar *pad_name; OwrMediaType media_type = OWR_MEDIA_TYPE_UNKNOWN; diff --git a/owr/Makefile.am b/owr/Makefile.am index 1df399e5..89a60920 100644 --- a/owr/Makefile.am +++ b/owr/Makefile.am @@ -8,11 +8,9 @@ AM_CPPFLAGS = \ $(GSTREAMER_CFLAGS) AM_CFLAGS = \ - -ansi \ -Wall \ -Wextra \ -Werror \ - -pedantic \ $(DEBUG_CFLAGS) lib_LTLIBRARIES = libopenwebrtc.la diff --git a/transport/Makefile.am b/transport/Makefile.am index 17061eb2..a050421b 100644 --- a/transport/Makefile.am +++ b/transport/Makefile.am @@ -11,11 +11,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/owr AM_CFLAGS = \ - -ansi \ -Wall \ -Wextra \ -Werror \ - -pedantic \ $(DEBUG_CFLAGS) noinst_LTLIBRARIES = libopenwebrtc_transport.la diff --git a/transport/owr_candidate.c b/transport/owr_candidate.c index ec6d91b4..5605a200 100644 --- a/transport/owr_candidate.c +++ b/transport/owr_candidate.c @@ -230,12 +230,12 @@ static void owr_candidate_class_init(OwrCandidateClass *klass) OWR_CANDIDATE_TYPE_HOST, OWR_CANDIDATE_TYPE_RELAY, OWR_CANDIDATE_TYPE_HOST, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_COMPONENT_TYPE] = g_param_spec_uint("component_type", "Component type", + obj_properties[PROP_COMPONENT_TYPE] = g_param_spec_uint("component-type", "Component type", "The stream component type (RTP/RTCP)", OWR_COMPONENT_TYPE_RTP, OWR_COMPONENT_TYPE_RTCP, OWR_COMPONENT_TYPE_RTP, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_TRANSPORT_TYPE] = g_param_spec_uint("transport_type", "Transport type", + obj_properties[PROP_TRANSPORT_TYPE] = g_param_spec_uint("transport-type", "Transport type", "The transport type (UDP or TCP (active/passive/simultaneous open))", OWR_TRANSPORT_TYPE_UDP, OWR_TRANSPORT_TYPE_TCP_SO, OWR_TRANSPORT_TYPE_UDP, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);