From fabe8d945426fca0cdbed4df109044657cae2be9 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 11 Mar 2020 18:25:37 +0900 Subject: [PATCH] Update package version for GStreamer upgrade - Synchronize package version with GStreamer packages - Remove duplicated code in configure.ac - Clean up Makefile.am [Version] 1.16.2-0 [Profile] Common [Issue Type] Update Change-Id: I650eef85e2c7a2aa797ad542e4de5dd2f06a9a8f Signed-off-by: Jeongmo Yang --- alfec/Makefile.am | 79 ++++++++++++++++++++---------------- audioeq/src/Makefile.am | 16 +++++++- audioeq/unittest/Makefile.am | 34 ++++++++-------- audiotp/src/Makefile.am | 14 +++++-- configure.ac | 84 ++++++++++++++++++++++----------------- drmdecryptor/src/Makefile.am | 3 ++ encodebin/src/Makefile.am | 34 ++++++++-------- fimcconvert/src/Makefile.am | 74 +++++++++++++++++++++------------- packaging/gst-plugins-tizen.spec | 4 +- tinycompresssink/src/Makefile.am | 1 + tinycompresssink/test/Makefile.am | 11 ++++- tizencamerasrc/src/Makefile.am | 37 +++++++++-------- tizenipc/src/Makefile.am | 37 ++++++++++++++--- tizenwlsink/src/Makefile.am | 24 +++++++++-- tizenwlsink/unittest/Makefile.am | 29 ++++++++++---- toggle/src/Makefile.am | 61 ++++++++++++++-------------- video360/src/Makefile.am | 34 ++++++++++------ video360/unittest/Makefile.am | 13 +++--- waylandsrc/src/Makefile.am | 37 +++++++++-------- wfdmanager/Makefile.am | 39 ++++++++++++------ wfdmanager/src/Makefile.am | 43 +++++++++++++------- wfdmanager/unittest/Makefile.am | 22 ++++++---- wfdmanager/wfdbase/Makefile.am | 30 +++++++++----- wfdtizenmanager/Makefile.am | 20 +++++++--- wfdtsdemux/Makefile.am | 20 +++++----- 25 files changed, 501 insertions(+), 299 deletions(-) diff --git a/alfec/Makefile.am b/alfec/Makefile.am index 92e53d4..e279716 100644 --- a/alfec/Makefile.am +++ b/alfec/Makefile.am @@ -1,39 +1,50 @@ plugin_LTLIBRARIES = libgstalfec.la -libgstalfec_la_SOURCES = gstalfec.c \ - gstalfecencoder.c \ - gstalfecdecoder.c \ - gst_source_blocking_algorithm.c \ - gstalfecencaps.c \ - gst_source_deblocking_algorithm.c \ - gstalfecdecaps.c - -libgstalfec_la_SOURCES += feccodes/FECCodes.c \ - feccodes/FecEncoder.c \ - feccodes/FecDecoder.c \ - feccodes/RS/RSBase.c \ - feccodes/RS/RSDecoder.c \ - feccodes/RS/RSEncoder.c - -libgstalfec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_BASE_CFLAGS) $(GST_CFLAGS) \ - -I$(srcdir)/feccodes/include -libgstalfec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - $(GST_BASE_LIBS) \ - $(GST_LIBS) +libgstalfec_la_SOURCES = \ + gstalfec.c \ + gstalfecencoder.c \ + gstalfecdecoder.c \ + gst_source_blocking_algorithm.c \ + gstalfecencaps.c \ + gst_source_deblocking_algorithm.c \ + gstalfecdecaps.c + +libgstalfec_la_SOURCES += \ + feccodes/FECCodes.c \ + feccodes/FecEncoder.c \ + feccodes/FecDecoder.c \ + feccodes/RS/RSBase.c \ + feccodes/RS/RSDecoder.c \ + feccodes/RS/RSEncoder.c + +libgstalfec_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + -I$(srcdir)/feccodes/include + +libgstalfec_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) + libgstalfec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstalfec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) -noinst_HEADERS = gstalfecencoder.h \ - gstalfecdecoder.h \ - gst_source_blocking_algorithm.h \ - gstalfecencaps.h \ - gst_source_deblocking_algorithm.h \ - gstalfecdecaps.h - -noinst_HEADERS += feccodes/include/FECCodes.h \ - feccodes/include/FecEncoder.h \ - feccodes/include/FecDecoder.h \ - feccodes/include/RS/RSBase.h \ - feccodes/include/RS/RSEncoder.h \ - feccodes/include/RS/RSDecoder.h +noinst_HEADERS = \ + gstalfecencoder.h \ + gstalfecdecoder.h \ + gst_source_blocking_algorithm.h \ + gstalfecencaps.h \ + gst_source_deblocking_algorithm.h \ + gstalfecdecaps.h + +noinst_HEADERS += \ + feccodes/include/FECCodes.h \ + feccodes/include/FecEncoder.h \ + feccodes/include/FecDecoder.h \ + feccodes/include/RS/RSBase.h \ + feccodes/include/RS/RSEncoder.h \ + feccodes/include/RS/RSDecoder.h + diff --git a/audioeq/src/Makefile.am b/audioeq/src/Makefile.am index c077e2c..2dab02e 100644 --- a/audioeq/src/Makefile.am +++ b/audioeq/src/Makefile.am @@ -18,8 +18,20 @@ libgstaudioeq_la_SOURCES = gstaudioeq.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed -libgstaudioeq_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) -libgstaudioeq_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM) -lgstbase-1.0 -lglib-2.0 -lgstcontroller-1.0 +libgstaudioeq_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CONTROLLER_CFLAGS) + +libgstaudioeq_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_AUDIO_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_CONTROLLER_LIBS) \ + $(GST_LIBS) $(LIBM) + libgstaudioeq_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/audioeq/unittest/Makefile.am b/audioeq/unittest/Makefile.am index 7f53821..024ec83 100644 --- a/audioeq/unittest/Makefile.am +++ b/audioeq/unittest/Makefile.am @@ -3,23 +3,21 @@ bin_PROGRAMS = gtest-audioeq gtest_audioeq_SOURCES = gtest_audioeq.cpp gtest_audioeq_CXXFLAGS = \ - -I$(top_srcdir)/audioeq/src \ - $(GST_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_BASE_CFLAGS) \ - $(GST_CONTROLLER_CFLAGS) \ - $(GTESTS_CFLAGS) + -I$(top_srcdir)/audioeq/src \ + $(GST_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CONTROLLER_CFLAGS) \ + $(GTESTS_CFLAGS) gtest_audioeq_LDADD = \ - $(top_builddir)/audioeq/src/libgstaudioeq.la \ - $(GST_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) \ - $(GST_BASE_LIBS) \ - $(GST_CONTROLLER_LIBS) \ - $(GST_LIBS) \ - $(LIBM) \ - -lgstbase-1.0 \ - -lglib-2.0 \ - -lgstcontroller-1.0 \ - $(GTESTS_LIBS) + $(top_builddir)/audioeq/src/libgstaudioeq.la \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_AUDIO_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_CONTROLLER_LIBS) \ + $(GST_LIBS) \ + $(LIBM) \ + $(GTESTS_LIBS) + diff --git a/audiotp/src/Makefile.am b/audiotp/src/Makefile.am index 436666c..9b85a9d 100644 --- a/audiotp/src/Makefile.am +++ b/audiotp/src/Makefile.am @@ -18,9 +18,17 @@ libgstaudiotp_la_SOURCES = gstaudiotp.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed -libgstaudiotp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) -libgstaudiotp_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) +libgstaudiotp_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) + +libgstaudiotp_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) + libgstaudiotp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # headers we need but don't want installed -noinst_HEADERS = gstaudiotp.h \ No newline at end of file +noinst_HEADERS = gstaudiotp.h diff --git a/configure.ac b/configure.ac index d8ed1f3..21ec3f4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(gst-plugins-tizen, 1.0) +AC_INIT(gst-plugins-tizen, 1.16.2) dnl versions of gstreamer and plugins-base -GST_MAJORMINOR=1.0 -GST_REQUIRED=1.2.0 -GSTPB_REQUIRED=1.2.0 +GST_API_VERSION=1.0 +GST_REQUIRED=1.16.2 +GSTPB_REQUIRED=1.16.2 dnl fill in your package name and version here dnl the fourth (nano) number should be 0 for a release, 1 for CVS, @@ -66,7 +66,7 @@ AM_CONDITIONAL([ISPROTECTOR_TARGET], [test "x$ARCH" = "xarm" && test "x$MACHINE" AM_CONDITIONAL([ISVOLANS_TARGET], [test "x$ARCH" = "xarm" && test "x$MACHINE" = "xvolans"]) PKG_CHECK_MODULES(GST, \ - gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED, + gstreamer-$GST_API_VERSION >= $GST_REQUIRED, HAVE_GST=yes,HAVE_GST=no) dnl Give error and exit if we don't have gstreamer @@ -74,25 +74,24 @@ if test "x$HAVE_GST" = "xno"; then AC_MSG_ERROR(you need gstreamer development packages installed !) fi -dnl append GST_ERROR cflags to GST_CFLAGS -GST_CFLAGS="$GST_CFLAGS $GST_ERROR" - dnl make GST_CFLAGS and GST_LIBS available -PKG_CHECK_MODULES(GST, gstreamer-1.0 >= 1.2.0) AC_SUBST(GST_CFLAGS) AC_SUBST(GST_LIBS) -dnl make GST_MAJORMINOR available in Makefile.am -AC_SUBST(GST_MAJORMINOR) +dnl append GST_ERROR cflags to GST_CFLAGS +GST_CFLAGS="$GST_CFLAGS $GST_ERROR" + +dnl make GST_API_VERSION available in Makefile.am +AC_SUBST(GST_API_VERSION) dnl If we need them, we can also use the base class libraries -PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED, +PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_API_VERSION >= $GST_REQUIRED, HAVE_GST_BASE=yes, HAVE_GST_BASE=no) dnl Give a warning if we don't have gstreamer libs dnl you can turn this into an error if you need them if test "x$HAVE_GST_BASE" = "xno"; then - AC_MSG_NOTICE(no GStreamer base class libraries found (gstreamer-base-$GST_MAJORMINOR)) + AC_MSG_NOTICE(no GStreamer base class libraries found (gstreamer-base-$GST_API_VERSION)) fi dnl make _CFLAGS and _LIBS available @@ -101,13 +100,13 @@ AC_SUBST(GST_BASE_LIBS) dnl If we need them, we can also use the gstreamer-plugins-base libraries PKG_CHECK_MODULES(GSTPB_BASE, - gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQUIRED, + gstreamer-plugins-base-$GST_API_VERSION >= $GSTPB_REQUIRED, HAVE_GSTPB_BASE=yes, HAVE_GSTPB_BASE=no) dnl Give a warning if we don't have gstreamer libs dnl you can turn this into an error if you need them if test "x$HAVE_GSTPB_BASE" = "xno"; then - AC_MSG_NOTICE(no GStreamer Plugins Base libraries found (gstreamer-plugins-base-$GST_MAJORMINOR)) + AC_MSG_NOTICE(no GStreamer Plugins Base libraries found (gstreamer-plugins-base-$GST_API_VERSION)) fi dnl make _CFLAGS and _LIBS available @@ -115,25 +114,25 @@ AC_SUBST(GSTPB_BASE_CFLAGS) AC_SUBST(GSTPB_BASE_LIBS) dnl If we need them, we can also use the gstreamer-controller libraries -PKG_CHECK_MODULES(GSTCTRL, - gstreamer-controller-$GST_MAJORMINOR >= $GSTPB_REQUIRED, - HAVE_GSTCTRL=yes, HAVE_GSTCTRL=no) +PKG_CHECK_MODULES(GST_CONTROLLER, + gstreamer-controller-$GST_API_VERSION >= $GSTPB_REQUIRED, + HAVE_GST_CONTROLLER=yes, HAVE_GST_CONTROLLER=no) dnl Give a warning if we don't have gstreamer-controller dnl you can turn this into an error if you need them -if test "x$HAVE_GSTCTRL" = "xno"; then - AC_MSG_NOTICE(no GStreamer Controller libraries found (gstreamer-controller-$GST_MAJORMINOR)) +if test "x$HAVE_GST_CONTROLLER" = "xno"; then + AC_MSG_NOTICE(no GStreamer Controller libraries found (gstreamer-controller-$GST_API_VERSION)) fi dnl make _CFLAGS and _LIBS available -AC_SUBST(GSTCTRL_CFLAGS) -AC_SUBST(GSTCTRL_LIBS) +AC_SUBST(GST_CONTROLLER_CFLAGS) +AC_SUBST(GST_CONTROLLER_LIBS) dnl set the plugindir where plugins should be installed if test "x${prefix}" = "x$HOME"; then - plugindir="$HOME/.gstreamer-$GST_MAJORMINOR/plugins" + plugindir="$HOME/.gstreamer-$GST_API_VERSION/plugins" else - plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR" + plugindir="\$(libdir)/gstreamer-$GST_API_VERSION" fi AC_SUBST(plugindir) @@ -144,20 +143,20 @@ GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst AC_SUBST(GST_PLUGIN_LDFLAGS) -PKG_CHECK_MODULES(GST_AUDIO, gstreamer-audio-$GST_MAJORMINOR >= $GST_REQUIRED ) +PKG_CHECK_MODULES(GST_AUDIO, gstreamer-audio-$GST_API_VERSION >= $GST_REQUIRED ) dnl make _CFLAGS and _LIBS available AC_SUBST(GST_AUDIO_CFLAGS) AC_SUBST(GST_AUDIO_LIBS) -PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-$GST_MAJORMINOR >= $GST_REQUIRED) +PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-$GST_API_VERSION >= $GST_REQUIRED) dnl make _CFLAGS and _LIBS available AC_SUBST(GST_VIDEO_CFLAGS) AC_SUBST(GST_VIDEO_LIBS) -PKG_CHECK_MODULES(GST_ALLOCATORS, gstreamer-allocators-$GST_MAJORMINOR >= $GST_REQUIRED) +PKG_CHECK_MODULES(GST_ALLOCATORS, gstreamer-allocators-$GST_API_VERSION >= $GST_REQUIRED) AC_SUBST(GST_ALLOCATORS_CFLAGS) AC_SUBST(GST_ALLOCATORS_LIBS) @@ -270,6 +269,17 @@ AC_ARG_ENABLE(wfdmanager, AC_HELP_STRING([--enable-wfdmanager], [using wfdmanage [GST_TIZEN_USE_WFDMANAGER=yes]) AM_CONDITIONAL(GST_TIZEN_USE_WFDMANAGER, test "x$GST_TIZEN_USE_WFDMANAGER" = "xyes") +if [test "x$GST_TIZEN_USE_WFDMANAGER" = "xyes"]; +then +PKG_CHECK_MODULES(GST_RTP, gstreamer-rtp-$GST_API_VERSION) +AC_SUBST(GST_RTP_CFLAGS) +AC_SUBST(GST_RTP_LIBS) + +PKG_CHECK_MODULES(GST_RTSP, gstreamer-rtsp-$GST_API_VERSION) +AC_SUBST(GST_RTSP_CFLAGS) +AC_SUBST(GST_RTSP_LIBS) +fi + dnl use wfdtsdemux -------------------------------------------------------------------------- AC_ARG_ENABLE(wfdtsdemux, AC_HELP_STRING([--enable-wfdtsdemux], [using wfdtsdemux]), [ @@ -282,6 +292,17 @@ AC_ARG_ENABLE(wfdtsdemux, AC_HELP_STRING([--enable-wfdtsdemux], [using wfdtsdemu [GST_TIZEN_USE_WFDTSDEMUX=yes]) AM_CONDITIONAL(GST_TIZEN_USE_WFDTSDEMUX, test "x$GST_TIZEN_USE_WFDTSDEMUX" = "xyes") +if [test "x$GST_TIZEN_USE_WFDTSDEMUX" = "xyes"]; +then +PKG_CHECK_MODULES(GST_TAG, gstreamer-tag-$GST_API_VERSION) +AC_SUBST(GST_TAG_CFLAGS) +AC_SUBST(GST_TAG_LIBS) + +PKG_CHECK_MODULES(GSTPB_UTILS, gstreamer-pbutils-$GST_API_VERSION) +AC_SUBST(GSTPB_UTILS_CFLAGS) +AC_SUBST(GSTPB_UTILS_LIBS) +fi + dnl use waylandsrc -------------------------------------------------------------------------- AC_ARG_ENABLE(waylandsrc, AC_HELP_STRING([--enable-waylandsrc], [using waylandsrc]), [ @@ -380,15 +401,6 @@ AS_IF([test "x$with_tizen_platform" = "xyes"], [ CFLAGS="$CFLAGS -DGST_TIZEN_PLATFORM" ]) -AS_IF([test "x$with_native_formats" = "xyes" -o "x$with_gles2" = "xyes"], [ - PKG_CHECK_MODULES(TBM, [ - libtbm - ], [ - AC_SUBST(TBM_CFLAGS) - AC_SUBST(TBM_LIBS) - ]) -]) - AS_IF([test "x$with_native_formats" = "xyes"], [ CFLAGS="$CFLAGS -DGST_TIZEN_USE_NATIVE_FORMATS" ]) diff --git a/drmdecryptor/src/Makefile.am b/drmdecryptor/src/Makefile.am index 24d47ec..8e44475 100644 --- a/drmdecryptor/src/Makefile.am +++ b/drmdecryptor/src/Makefile.am @@ -5,11 +5,14 @@ libgstdrmdecryptor_la_SOURCES = gstdrmdecryptor.c libgstdrmdecryptor_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) + libgstdrmdecryptor_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) + libgstdrmdecryptor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstdrmdecryptor_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) noinst_HEADERS = gstdrmdecryptor.h diff --git a/encodebin/src/Makefile.am b/encodebin/src/Makefile.am index c855890..14311a5 100644 --- a/encodebin/src/Makefile.am +++ b/encodebin/src/Makefile.am @@ -1,28 +1,28 @@ glib_enum_define=GST_RECORD glib_enum_prefix=gst_record -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ +# plugindir is set in configure + +plugin_LTLIBRARIES = libgstencodebin.la -plugin_LTLIBRARIES = libgstencodebin.la libgstencodebin_la_SOURCES = gstencodebin.c + nodist_libgstencodebin_la_SOURCES = $(built_sources) -libgstencodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) + +libgstencodebin_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) + libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstencodebin_la_LIBADD = \ - $(GST_LIBS)\ - $(GST_BASE_LIBS) \ - $(GST_LIBS) -if ISPROTECTOR_TARGET -libgstencodebin_la_CFLAGS += -DUSE_ENCODER_QUEUE_SET -libgstencodebin_la_CFLAGS += -DVIDEO_ENC_QUE_TIME=4 -DAUDIO_ENC_QUE_TIME=4 -endif - -if ISVOLANS_TARGET -libgstencodebin_la_CFLAGS += -DUSE_ENCODER_QUEUE_SET -libgstencodebin_la_CFLAGS += -DVIDEO_ENC_QUE_TIME=4 -DAUDIO_ENC_QUE_TIME=4 -endif - -BUILT_SOURCES = $(built_headers) $(built_sources) + $(GST_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) + +BUILT_SOURCES = \ + $(built_headers) \ + $(built_sources) CLEANFILES = $(BUILT_SOURCES) diff --git a/fimcconvert/src/Makefile.am b/fimcconvert/src/Makefile.am index cc34d3b..179b15c 100644 --- a/fimcconvert/src/Makefile.am +++ b/fimcconvert/src/Makefile.am @@ -1,27 +1,47 @@ -# plugindir is set in configure - -############################################################################## -# change libgstplugin.la to something more suitable, e.g. libmysomething.la # -############################################################################## -plugin_LTLIBRARIES = libgstfimcconvert.la - -############################################################################## -# for the next set of variables, rename the prefix if you renamed the .la, # -# e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # -# libgstplugin_la_CFLAGS => libmysomething_la_CFLAGS # -# libgstplugin_la_LIBADD => libmysomething_la_LIBADD # -# libgstplugin_la_LDFLAGS => libmysomething_la_LDFLAGS # -############################################################################## - -# sources used to compile this plug-in -libgstfimcconvert_la_SOURCES = gstfimcconvert.c fimc_drm_api.c - -# flags used to compile this plugin -# add other _CFLAGS and _LIBS as needed -libgstfimcconvert_la_CFLAGS = $(GST_CFLAGS) $(GST_VIDEO_CFLAGS) $(DRM_CFLAGS) $(XFIXES_CFLAGS) $(DRI2PROTO_CFLAGS) $(DRI2_CFLAGS) $(TBM_CFLAGS) -libgstfimcconvert_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_VIDEO_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) $(DRI2PROTO_LIBS) $(DRI2_LIBS) $(TBM_LIBS) -libgstfimcconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -# headers we need but don't want installed -noinst_HEADERS = gstfimcconvert.h fimc_drm_api.h - +# plugindir is set in configure + +############################################################################## +# change libgstplugin.la to something more suitable, e.g. libmysomething.la # +############################################################################## +plugin_LTLIBRARIES = libgstfimcconvert.la + +############################################################################## +# for the next set of variables, rename the prefix if you renamed the .la, # +# e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # +# libgstplugin_la_CFLAGS => libmysomething_la_CFLAGS # +# libgstplugin_la_LIBADD => libmysomething_la_LIBADD # +# libgstplugin_la_LDFLAGS => libmysomething_la_LDFLAGS # +############################################################################## + +# sources used to compile this plug-in +libgstfimcconvert_la_SOURCES = \ + gstfimcconvert.c \ + fimc_drm_api.c + +# flags used to compile this plugin +# add other _CFLAGS and _LIBS as needed +libgstfimcconvert_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_VIDEO_CFLAGS) \ + $(DRM_CFLAGS) \ + $(XFIXES_CFLAGS) \ + $(DRI2PROTO_CFLAGS) \ + $(DRI2_CFLAGS) \ + $(TBM_CFLAGS) + +libgstfimcconvert_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_VIDEO_LIBS) \ + $(DRM_LIBS) \ + $(XFIXES_LIBS) \ + $(DRI2PROTO_LIBS) \ + $(DRI2_LIBS) \ + $(TBM_LIBS) + +libgstfimcconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +# headers we need but don't want installed +noinst_HEADERS = gstfimcconvert.h fimc_drm_api.h + diff --git a/packaging/gst-plugins-tizen.spec b/packaging/gst-plugins-tizen.spec index ca8f741..dfec5b6 100644 --- a/packaging/gst-plugins-tizen.spec +++ b/packaging/gst-plugins-tizen.spec @@ -3,9 +3,9 @@ %define gst_branch 1.0 Name: gst-plugins-tizen -Version: 1.0.0 +Version: 1.16.2 Summary: GStreamer tizen plugins (common) -Release: 99 +Release: 0 Group: Multimedia/Framework Url: http://gstreamer.freedesktop.org/ License: LGPL-2.1+ diff --git a/tinycompresssink/src/Makefile.am b/tinycompresssink/src/Makefile.am index 326ab5e..f933b8a 100644 --- a/tinycompresssink/src/Makefile.am +++ b/tinycompresssink/src/Makefile.am @@ -15,6 +15,7 @@ libgsttinycompress_la_LIBADD = \ $(TINYCOMPRESS_LIBS) libgsttinycompress_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgsttinycompress_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gsttinycompresssink.h diff --git a/tinycompresssink/test/Makefile.am b/tinycompresssink/test/Makefile.am index 0a2b9c6..61b198a 100644 --- a/tinycompresssink/test/Makefile.am +++ b/tinycompresssink/test/Makefile.am @@ -1,5 +1,12 @@ bin_PROGRAMS = tinycompress_test tinycompress_test_SOURCES = tinycompress_test.c -tinycompress_test_CFLAGS = $(GST_CFLAGS) $(SOUND_MANAGER_CFLAGS) -tinycompress_test_LDADD = $(GST_LIBS) $(SOUND_MANAGER_LIBS) + +tinycompress_test_CFLAGS = \ + $(GST_CFLAGS) \ + $(SOUND_MANAGER_CFLAGS) + +tinycompress_test_LDADD = \ + $(GST_LIBS) \ + $(SOUND_MANAGER_LIBS) + diff --git a/tizencamerasrc/src/Makefile.am b/tizencamerasrc/src/Makefile.am index e209d9c..9deab0e 100644 --- a/tizencamerasrc/src/Makefile.am +++ b/tizencamerasrc/src/Makefile.am @@ -3,25 +3,28 @@ plugin_LTLIBRARIES = libgsttizencamerasrc.la # sources used to compile this plug-in -libgsttizencamerasrc_la_SOURCES = gsttizencamerasrc.c \ - gsttizencamerasrccontrol.c \ - gsttizencamerasrccolorbalance.c +libgsttizencamerasrc_la_SOURCES = \ + gsttizencamerasrc.c \ + gsttizencamerasrccontrol.c \ + gsttizencamerasrccolorbalance.c -libgsttizencamerasrc_la_CFLAGS = -I$(srcdir)/include \ - $(CAMERA_HAL_INTERFACE_CFLAGS) \ - $(GST_CFLAGS) \ - $(GST_BASE_CFLAGS) \ - $(GST_VIDEO_FLAGS) \ - $(GST_ALLOCATORS_CFLAGS) \ - $(TBM_CFLAGS) +libgsttizencamerasrc_la_CFLAGS = \ + -I$(srcdir)/include \ + $(CAMERA_HAL_INTERFACE_CFLAGS) \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_VIDEO_FLAGS) \ + $(GST_ALLOCATORS_CFLAGS) \ + $(TBM_CFLAGS) -libgsttizencamerasrc_la_LIBADD = -ldl -lpthread -lrt -lm \ - $(CAMERA_HAL_INTERFACE_LIBS) \ - $(GST_LIBS) \ - $(GST_BASE_LIBS) \ - $(GST_VIDEO_LIBS) \ - $(GST_ALLOCATORS_LIBS) \ - $(TBM_LIBS) +libgsttizencamerasrc_la_LIBADD = \ + -ldl -lpthread -lrt -lm \ + $(CAMERA_HAL_INTERFACE_LIBS) \ + $(GST_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_VIDEO_LIBS) \ + $(GST_ALLOCATORS_LIBS) \ + $(TBM_LIBS) libgsttizencamerasrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/tizenipc/src/Makefile.am b/tizenipc/src/Makefile.am index bc88145..15fa26e 100644 --- a/tizenipc/src/Makefile.am +++ b/tizenipc/src/Makefile.am @@ -3,7 +3,9 @@ ############################################################################## # change libgstplugin.la to something more suitable, e.g. libmysomething.la # ############################################################################## -plugin_LTLIBRARIES = libgsttizenipcsink.la libgsttizenipcsrc.la +plugin_LTLIBRARIES = \ + libgsttizenipcsink.la \ + libgsttizenipcsrc.la ############################################################################## # for the next set of variables, rename the prefix if you renamed the .la, # @@ -18,17 +20,42 @@ libgsttizenipcsink_la_SOURCES = gsttizenipcsink.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed -libgsttizenipcsink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_ALLOCATORS_CFLAGS) $(TBM_CFLAGS) -libgsttizenipcsink_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_ALLOCATORS_LIBS) $(TBM_LIBS) +libgsttizenipcsink_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_ALLOCATORS_CFLAGS) \ + $(TBM_CFLAGS) + +libgsttizenipcsink_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_ALLOCATORS_LIBS) \ + $(TBM_LIBS) + libgsttizenipcsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + # sources used to compile this plug-in libgsttizenipcsrc_la_SOURCES = gsttizenipcsrc.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed -libgsttizenipcsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_ALLOCATORS_CFLAGS) $(TBM_CFLAGS) -libgsttizenipcsrc_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_ALLOCATORS_LIBS) $(TBM_LIBS) +libgsttizenipcsrc_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_ALLOCATORS_CFLAGS) \ + $(TBM_CFLAGS) + +libgsttizenipcsrc_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_ALLOCATORS_LIBS) \ + $(TBM_LIBS) + libgsttizenipcsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # headers we need but don't want installed diff --git a/tizenwlsink/src/Makefile.am b/tizenwlsink/src/Makefile.am index 1cc4414..1a29a23 100644 --- a/tizenwlsink/src/Makefile.am +++ b/tizenwlsink/src/Makefile.am @@ -10,12 +10,28 @@ libgsttizenwlsink_la_SOURCES = \ wlvideoformat.c \ tizen-wlvideoformat.c -libgsttizenwlsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)$ $(GST_PLUGINS_BASE_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_ALLOCATORS_CFLAGS)\ - $(WAYLAND_CFLAGS) $(DRM_CFLAGS) $(TBM_CFLAGS) +libgsttizenwlsink_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS)$ \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_VIDEO_CFLAGS) \ + $(GST_ALLOCATORS_CFLAGS) \ + $(WAYLAND_CFLAGS) \ + $(DRM_CFLAGS) \ + $(TBM_CFLAGS) + libgsttizenwlsink_la_LIBADD = \ - $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_VIDEO_LIBS) $(GST_ALLOCATORS_LIBS)\ - $(WAYLAND_LIBS) $(DRM_LIBS) $(TBM_LIBS) + $(GST_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_VIDEO_LIBS) \ + $(GST_ALLOCATORS_LIBS) \ + $(WAYLAND_LIBS) \ + $(DRM_LIBS) \ + $(TBM_LIBS) + libgsttizenwlsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgsttizenwlsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) noinst_HEADERS = \ diff --git a/tizenwlsink/unittest/Makefile.am b/tizenwlsink/unittest/Makefile.am index 1232ca5..94289da 100644 --- a/tizenwlsink/unittest/Makefile.am +++ b/tizenwlsink/unittest/Makefile.am @@ -3,12 +3,27 @@ bin_PROGRAMS = gtests-tizenwlsink gtests_tizenwlsink_SOURCES = gtests_tizenwlsink.cpp gtests_tizenwlsink_CXXFLAGS = \ - -I$(top_srcdir)/tizenwlsink/src \ - -DTIZEN_FEATURE_WLSINK_ENHANCEMENT \ - $(GST_CFLAGS) $(GST_BASE_CFLAGS)$ $(GST_PLUGINS_BASE_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_ALLOCATORS_CFLAGS)\ - $(WAYLAND_CFLAGS) $(DRM_CFLAGS) $(TBM_CFLAGS) $(GTESTS_CFLAGS) + -I$(top_srcdir)/tizenwlsink/src \ + -DTIZEN_FEATURE_WLSINK_ENHANCEMENT \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS)$ \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_VIDEO_CFLAGS) \ + $(GST_ALLOCATORS_CFLAGS) \ + $(WAYLAND_CFLAGS) \ + $(DRM_CFLAGS) \ + $(TBM_CFLAGS) \ + $(GTESTS_CFLAGS) gtests_tizenwlsink_LDADD = \ - $(top_builddir)/tizenwlsink/src/libgsttizenwlsink.la \ - $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_VIDEO_LIBS) $(GST_ALLOCATORS_LIBS)\ - $(WAYLAND_LIBS) $(DRM_LIBS) $(TBM_LIBS) $(GTESTS_LIBS) + $(top_builddir)/tizenwlsink/src/libgsttizenwlsink.la \ + $(GST_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_VIDEO_LIBS) \ + $(GST_ALLOCATORS_LIBS) \ + $(WAYLAND_LIBS) \ + $(DRM_LIBS) \ + $(TBM_LIBS) \ + $(GTESTS_LIBS) + diff --git a/toggle/src/Makefile.am b/toggle/src/Makefile.am index 4d761d7..6aa7cd8 100644 --- a/toggle/src/Makefile.am +++ b/toggle/src/Makefile.am @@ -1,30 +1,31 @@ -# plugindir is set in configure - -############################################################################## -# change libgstplugin.la to something more suitable, e.g. libmysomething.la # -############################################################################## -plugin_LTLIBRARIES = libgsttoggle.la - -############################################################################## -# for the next set of variables, rename the prefix if you renamed the .la, # -# e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # -# libgstplugin_la_CFLAGS => libmysomething_la_CFLAGS # -# libgstplugin_la_LIBADD => libmysomething_la_LIBADD # -# libgstplugin_la_LDFLAGS => libmysomething_la_LDFLAGS # -############################################################################## - -# sources used to compile this plug-in -libgsttoggle_la_SOURCES = gsttoggle.c - - - -# flags used to compile this plugin -# add other _CFLAGS and _LIBS as needed -libgsttoggle_la_CFLAGS = $(GST_CFLAGS) -libgsttoggle_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) -#libgsttoggle_la_LIBADD = $(GST_BASE_LIBS) -libgsttoggle_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -# headers we need but don't want installed -noinst_HEADERS = gsttoggle.h - +# plugindir is set in configure + +############################################################################## +# change libgstplugin.la to something more suitable, e.g. libmysomething.la # +############################################################################## +plugin_LTLIBRARIES = libgsttoggle.la + +############################################################################## +# for the next set of variables, rename the prefix if you renamed the .la, # +# e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # +# libgstplugin_la_CFLAGS => libmysomething_la_CFLAGS # +# libgstplugin_la_LIBADD => libmysomething_la_LIBADD # +# libgstplugin_la_LDFLAGS => libmysomething_la_LDFLAGS # +############################################################################## + +# sources used to compile this plug-in +libgsttoggle_la_SOURCES = gsttoggle.c + +# flags used to compile this plugin +# add other _CFLAGS and _LIBS as needed +libgsttoggle_la_CFLAGS = $(GST_CFLAGS) + +libgsttoggle_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_BASE_LIBS) + +libgsttoggle_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +# headers we need but don't want installed +noinst_HEADERS = gsttoggle.h + diff --git a/video360/src/Makefile.am b/video360/src/Makefile.am index 9cb0c67..09901fd 100644 --- a/video360/src/Makefile.am +++ b/video360/src/Makefile.am @@ -1,21 +1,31 @@ plugin_LTLIBRARIES = libgstvideo360.la # sources used to compile this plug-in -libgstvideo360_la_SOURCES = gstvideo360.c\ - gstvideo360-gl.c\ - gstvideo360-equirectangular.c\ - gstvideo360-formats.c +libgstvideo360_la_SOURCES = \ + gstvideo360.c \ + gstvideo360-gl.c \ + gstvideo360-equirectangular.c \ + gstvideo360-formats.c # compiler and linker flags used to compile this plugin, set in configure.ac -libgstvideo360_la_CFLAGS = $(GST_CFLAGS)\ - $(TPL_CFLAGS)\ - $(TBM_CFLAGS)\ - $(GST_ALLOCATORS_CFLAGS)\ - $(GLES_CFLAGS)\ - -Wdouble-promotion\ - -fsingle-precision-constant -libgstvideo360_la_LIBADD = $(GST_LIBS) $(TPL_LIBS) $(TBM_LIBS) $(GLES_LIBS) $(GST_ALLOCATORS_LIBS) +libgstvideo360_la_CFLAGS = \ + $(GST_CFLAGS) \ + $(TPL_CFLAGS) \ + $(TBM_CFLAGS) \ + $(GST_ALLOCATORS_CFLAGS) \ + $(GLES_CFLAGS) \ + -Wdouble-promotion \ + -fsingle-precision-constant + +libgstvideo360_la_LIBADD = \ + $(GST_LIBS) \ + $(TPL_LIBS) \ + $(TBM_LIBS) \ + $(GLES_LIBS) \ + $(GST_ALLOCATORS_LIBS) + libgstvideo360_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # headers we need but don't want installed noinst_HEADERS = gstvideo360.h video360.h + diff --git a/video360/unittest/Makefile.am b/video360/unittest/Makefile.am index c916587..04cdbbf 100644 --- a/video360/unittest/Makefile.am +++ b/video360/unittest/Makefile.am @@ -3,11 +3,12 @@ bin_PROGRAMS = gtest-video360 gtest_video360_SOURCES = gtest_video360.cpp gtest_video360_CXXFLAGS = \ - -I$(top_srcdir)/video360/src \ - $(GTESTS_CFLAGS) \ - $(GLES_CFLAGS) + -I$(top_srcdir)/video360/src \ + $(GTESTS_CFLAGS) \ + $(GLES_CFLAGS) gtest_video360_LDADD = \ - $(top_builddir)/video360/src/libgstvideo360.la \ - $(GTESTS_LIBS) \ - $(GLES_LIBS) + $(top_builddir)/video360/src/libgstvideo360.la \ + $(GTESTS_LIBS) \ + $(GLES_LIBS) + diff --git a/waylandsrc/src/Makefile.am b/waylandsrc/src/Makefile.am index 71f2267..5812993 100644 --- a/waylandsrc/src/Makefile.am +++ b/waylandsrc/src/Makefile.am @@ -18,25 +18,28 @@ libgstwaylandsrc_la_SOURCES = gstwaylandsrc.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed -libgstwaylandsrc_la_CFLAGS = $(TBM_CFLAGS) \ - $(GST_CFLAGS) \ - $(GST_BASE_CFLAGS) \ - $(GST_VIDEO_FLAGS) \ - $(GST_ALLOCATORS_FLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(WAYLAND_CLIENT_CFLAGS) \ - $(DRM_CFLAGS) - -libgstwaylandsrc_la_LIBADD = $(GST_LIBS) \ - $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) \ - $(GST_VIDEO_LIBS) \ - $(GST_ALLOCATORS_LIBS) \ - $(WAYLAND_CLIENT_LIBS) \ - $(DRM_LIBS) \ - $(TBM_LIBS) +libgstwaylandsrc_la_CFLAGS = \ + $(TBM_CFLAGS) \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_VIDEO_FLAGS) \ + $(GST_ALLOCATORS_FLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(WAYLAND_CLIENT_CFLAGS) \ + $(DRM_CFLAGS) + +libgstwaylandsrc_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_VIDEO_LIBS) \ + $(GST_ALLOCATORS_LIBS) \ + $(WAYLAND_CLIENT_LIBS) \ + $(DRM_LIBS) \ + $(TBM_LIBS) libgstwaylandsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # headers we need but don't want installed noinst_HEADERS = gstwaylandsrc.h + diff --git a/wfdmanager/Makefile.am b/wfdmanager/Makefile.am index a2046c0..1e31998 100644 --- a/wfdmanager/Makefile.am +++ b/wfdmanager/Makefile.am @@ -1,27 +1,40 @@ SUBDIRS = wfdbase + if IS_TESTS SUBDIRS += unittest endif plugin_LTLIBRARIES = libgstwfdmanager.la -noinst_HEADERS = wfdrtpbuffer/wfdrtpbuffer.h \ - wfdrtpbuffer/gstwfdrtpbuffer.h \ - wfdrtpbuffer/rtpstats.h \ - wfdsrc/gstwfdsrc.h +noinst_HEADERS = \ + wfdrtpbuffer/wfdrtpbuffer.h \ + wfdrtpbuffer/gstwfdrtpbuffer.h \ + wfdrtpbuffer/rtpstats.h \ + wfdsrc/gstwfdsrc.h -libgstwfdmanager_la_SOURCES = gstwfdmanager.c \ - wfdsrc/gstwfdsrc.c \ - wfdrtpbuffer/wfdrtpbuffer.c \ - wfdrtpbuffer/gstwfdrtpbuffer.c \ - wfdrtpbuffer/rtpstats.c +libgstwfdmanager_la_SOURCES = \ + gstwfdmanager.c \ + wfdsrc/gstwfdsrc.c \ + wfdrtpbuffer/wfdrtpbuffer.c \ + wfdrtpbuffer/gstwfdrtpbuffer.c \ + wfdrtpbuffer/rtpstats.c -libgstwfdmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstwfdmanager_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_RTP_CFLAGS) \ + $(GST_RTSP_CFLAGS) -libgstwfdmanager_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \ - $(top_builddir)/wfdmanager/wfdbase/libgstwfdbase.la +libgstwfdmanager_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_RTP_LIBS) \ + $(GST_RTSP_LIBS) \ + $(top_builddir)/wfdmanager/wfdbase/libgstwfdbase.la libgstwfdmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstwfdmanager_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/wfdmanager/src/Makefile.am b/wfdmanager/src/Makefile.am index 6fd6029..9d8574e 100644 --- a/wfdmanager/src/Makefile.am +++ b/wfdmanager/src/Makefile.am @@ -1,23 +1,36 @@ plugin_LTLIBRARIES = libgstwfdmanager.la -libgstwfdmanager_la_SOURCES = gstwfdmanager.c \ - gstwfdrtspsrc.c \ - wfdrtspmanager.c \ - wfdrtpbuffer/wfdrtpbuffer.c \ - wfdrtpbuffer/gstwfdrtpbuffer.c \ - wfdrtpbuffer/rtpstats.c +libgstwfdmanager_la_SOURCES = \ + gstwfdmanager.c \ + gstwfdrtspsrc.c \ + wfdrtspmanager.c \ + wfdrtpbuffer/wfdrtpbuffer.c \ + wfdrtpbuffer/gstwfdrtpbuffer.c \ + wfdrtpbuffer/rtpstats.c -libgstwfdmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstwfdmanager_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_RTP_CFLAGS) \ + $(GST_RTSP_CFLAGS) -libgstwfdmanager_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \ - $(WIN32_LIBS) +libgstwfdmanager_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_RTP_LIBS) \ + $(GST_RTSP_LIBS) \ + $(WIN32_LIBS) libgstwfdmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstwfdmanager_la_LIBTOOLFLAGS = --tag=disable-static -noinst_HEADERS = gstwfdrtspsrc.h \ - wfdrtpbuffer/wfdrtpbuffer.h \ - wfdrtpbuffer/gstwfdrtpbuffer.h \ - wfdrtpbuffer/rtpstats.h \ - wfdrtspmanager.h +noinst_HEADERS = \ + gstwfdrtspsrc.h \ + wfdrtpbuffer/wfdrtpbuffer.h \ + wfdrtpbuffer/gstwfdrtpbuffer.h \ + wfdrtpbuffer/rtpstats.h \ + wfdrtspmanager.h + diff --git a/wfdmanager/unittest/Makefile.am b/wfdmanager/unittest/Makefile.am index bc4af45..66b2764 100644 --- a/wfdmanager/unittest/Makefile.am +++ b/wfdmanager/unittest/Makefile.am @@ -3,12 +3,20 @@ bin_PROGRAMS = gtest-wfdmanager gtest_wfdmanager_SOURCES = gtest_wfdmanager.cpp gtest_wfdmanager_CXXFLAGS = \ - -I$(top_srcdir)/wfdmanager/wfdbase \ - $(GTESTS_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) + -I$(top_srcdir)/wfdmanager/wfdbase \ + $(GTESTS_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(GST_RTP_CFLAGS) \ + $(GST_RTSP_CFLAGS) \ + $(GST_BASE_CFLAGS) gtest_wfdmanager_LDADD = \ - $(top_builddir)/wfdmanager/wfdbase/libgstwfdbase.la \ - -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \ - $(GTESTS_LIBS) \ - $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) + $(top_builddir)/wfdmanager/wfdbase/libgstwfdbase.la \ + $(GST_RTP_LIBS) \ + $(GST_RTSP_LIBS) \ + $(GTESTS_LIBS) \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) + diff --git a/wfdmanager/wfdbase/Makefile.am b/wfdmanager/wfdbase/Makefile.am index 5b2bca2..3b0a86e 100644 --- a/wfdmanager/wfdbase/Makefile.am +++ b/wfdmanager/wfdbase/Makefile.am @@ -1,20 +1,28 @@ lib_LTLIBRARIES = libgstwfdbase.la -#libgstwfdbase_includedir = \ -# $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/wfd -#libgstwfdbase_include_HEADERS = \ -# gstwfdbasesrc.h +noinst_HEADERS = \ + gstwfdbasesrc.h \ + gstwfdsinkmessage.h -noinst_HEADERS = gstwfdbasesrc.h gstwfdsinkmessage.h +libgstwfdbase_la_SOURCES = \ + gstwfdbasesrc.c \ + gstwfdsinkmessage.c -libgstwfdbase_la_SOURCES = gstwfdbasesrc.c \ - gstwfdsinkmessage.c +libgstwfdbase_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_RTP_CFLAGS) \ + $(GST_RTSP_CFLAGS) -libgstwfdbase_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) - -libgstwfdbase_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ +libgstwfdbase_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_RTP_LIBS) \ + $(GST_RTSP_LIBS) libgstwfdbase_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstwfdbase_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/wfdtizenmanager/Makefile.am b/wfdtizenmanager/Makefile.am index f6678da..46149dc 100644 --- a/wfdtizenmanager/Makefile.am +++ b/wfdtizenmanager/Makefile.am @@ -1,15 +1,25 @@ plugin_LTLIBRARIES = libgstwfdtizenmanager.la -libgstwfdtizenmanager_la_SOURCES = gstwfdtizenmanager.c \ - gstwfdtizensrc.c gstwfdtizenmessage.c +libgstwfdtizenmanager_la_SOURCES = \ + gstwfdtizenmanager.c \ + gstwfdtizensrc.c \ + gstwfdtizenmessage.c -libgstwfdtizenmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstwfdtizenmanager_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) -libgstwfdtizenmanager_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \ +libgstwfdtizenmanager_la_LIBADD = \ + $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + $(GST_BASE_LIBS) \ + $(GST_RTP_LIBS) \ + $(GST_RTSP_LIBS) \ $(top_builddir)/wfdmanager/wfdbase/libgstwfdbase.la libgstwfdtizenmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstwfdtizenmanager_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstwfdtizensrc.h gstwfdtizenmessage.h + diff --git a/wfdtsdemux/Makefile.am b/wfdtsdemux/Makefile.am index 3619c05..9a0afb8 100644 --- a/wfdtsdemux/Makefile.am +++ b/wfdtsdemux/Makefile.am @@ -6,9 +6,9 @@ libgstwfdtsdemux_la_SOURCES = \ gstwfdtssection.c \ gstwfdtsdescriptor.c \ wfdtspacketizer.c \ - wfdtsbase.c \ + wfdtsbase.c \ wfdtsparse.c \ - wfdtsdemux.c \ + wfdtsdemux.c \ gstwfdtsdemux.c \ wfdpesparse.c @@ -16,13 +16,16 @@ libgstwfdtsdemux_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) \ -DWFD_SPEC + libgstwfdtsdemux_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ - -lgsttag-@GST_MAJORMINOR@ \ - -lgstpbutils-@GST_MAJORMINOR@ \ + $(GST_TAG_LIBS) \ + $(GSTPB_UTILS_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) + libgstwfdtsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstwfdtsdemux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) noinst_HEADERS = \ @@ -31,12 +34,11 @@ noinst_HEADERS = \ wfdnalutils.h \ gstwfdtssection.h \ gstwfdtsdescriptor.h \ - gstwfdtsdefs.h \ - gstwfdtsdesc.h \ - wfdtsbase.h \ + gstwfdtsdefs.h \ + gstwfdtsdesc.h \ + wfdtsbase.h \ wfdtspacketizer.h \ wfdtsparse.h \ - wfdtsdemux.h \ + wfdtsdemux.h \ wfdpesparse.h - -- 2.7.4