summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiagoss@osg.samsung.com>2016-02-03 17:59:39 -0300
committerThiago Santos <thiagoss@osg.samsung.com>2016-02-03 18:02:37 -0300
commita63ec90151224156d0d1c3493ef4b85b2af04489 (patch)
treefa8b3c2eed3fe7bf700b48da59b081c3d2ef156a
parente16c61bdb14b7f30200620271b9c23b69fca608e (diff)
build: add top-level meson build filesHEADmaster
Removes build tooling from http-launch and replaces it with meson
-rw-r--r--.gitignore1
-rw-r--r--COPYING (renamed from http-launch/COPYING)0
-rw-r--r--http-launch/AUTHORS0
-rw-r--r--http-launch/Makefile.am2
-rw-r--r--http-launch/NEWS0
-rw-r--r--http-launch/README0
-rwxr-xr-xhttp-launch/autogen.sh16
-rw-r--r--http-launch/configure.ac87
-rw-r--r--http-launch/meson.build3
-rw-r--r--http-launch/src/Makefile.am6
-rw-r--r--meson.build2
11 files changed, 6 insertions, 111 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/http-launch/COPYING b/COPYING
index c87cfe8..c87cfe8 100644
--- a/http-launch/COPYING
+++ b/COPYING
diff --git a/http-launch/AUTHORS b/http-launch/AUTHORS
deleted file mode 100644
index e69de29..0000000
--- a/http-launch/AUTHORS
+++ /dev/null
diff --git a/http-launch/Makefile.am b/http-launch/Makefile.am
deleted file mode 100644
index f268924..0000000
--- a/http-launch/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = src
-
diff --git a/http-launch/NEWS b/http-launch/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/http-launch/NEWS
+++ /dev/null
diff --git a/http-launch/README b/http-launch/README
deleted file mode 100644
index e69de29..0000000
--- a/http-launch/README
+++ /dev/null
diff --git a/http-launch/autogen.sh b/http-launch/autogen.sh
deleted file mode 100755
index b1ca7fa..0000000
--- a/http-launch/autogen.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-# Automake requires that ChangeLog exist.
-touch ChangeLog
-mkdir -p m4
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode --enable-more-warnings --enable-warnings-as-errors "$@"
diff --git a/http-launch/configure.ac b/http-launch/configure.ac
deleted file mode 100644
index 2e2057b..0000000
--- a/http-launch/configure.ac
+++ /dev/null
@@ -1,87 +0,0 @@
-AC_INIT([http-launch], [0.0.1])
-AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS(config.h)
-
-AM_INIT_AUTOMAKE([dist-bzip2 -Wno-portability])
-AM_MAINTAINER_MODE
-
-LT_INIT([pic-only])
-
-m4_ifdef([AM_SILENT_RULES],
- [AM_SILENT_RULES([yes])],
- [
- AM_DEFAULT_VERBOSITY=1
- AC_SUBST(AM_DEFAULT_VERBOSITY)
- ]
-)
-
-AC_PROG_CC
-AC_PROG_CC_STDC
-AC_PROG_CPP
-AC_PROG_GREP
-AC_PROG_INSTALL
-AM_PROG_CC_C_O
-
-AC_HEADER_STDC
-AC_C_CONST
-AC_C_INLINE
-AC_ISC_POSIX
-AC_SYS_LARGEFILE
-
-AC_C_BIGENDIAN
-
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-PKG_PROG_PKG_CONFIG
-
-PKG_CHECK_MODULES(GST, gstreamer-1.0 >= 1.0.8)
-PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.22)
-
-CFLAGS="$CFLAGS -Wall"
-
-AC_ARG_ENABLE(more-warnings,
-AC_HELP_STRING([--enable-more-warnings], [Enable more compiler warnings]),
-set_more_warnings="$enableval", set_more_warnings=no)
-
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- AC_MSG_RESULT(yes)
-
- for option in -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wredundant-decls -Wundef -Wwrite-strings -Wformat-nonliteral -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Waggregate-return -Wno-multichar; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([whether gcc understands $option])
- AC_TRY_COMPILE([], [],
- has_option=yes,
- has_option=no,)
- if test $has_option = no; then
- CFLAGS="$SAVE_CFLAGS"
- fi
- AC_MSG_RESULT($has_option)
- unset has_option
- unset SAVE_CFLAGS
- done
- unset option
-else
- AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(warnings-as-errors,
-AC_HELP_STRING([--enable-warnings-as-errors], [Handle compiler warnings as errors]),
-set_werror="$enableval", set_werror=no)
-
-AC_MSG_CHECKING(for handling compiler warnings as errors)
-if test "$GCC" = "yes" -a "$set_werror" != "no"; then
- AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS -Werror"
-else
- AC_MSG_RESULT(no)
-fi
-
-AC_CONFIG_FILES([
- Makefile
- src/Makefile
-])
-
-AC_OUTPUT
diff --git a/http-launch/meson.build b/http-launch/meson.build
new file mode 100644
index 0000000..8971447
--- /dev/null
+++ b/http-launch/meson.build
@@ -0,0 +1,3 @@
+gstdep = dependency('gstreamer-1.0')
+giodep = dependency('gio-2.0')
+executable('http-launch', 'src/http-launch.c', dependencies : [gstdep, giodep])
diff --git a/http-launch/src/Makefile.am b/http-launch/src/Makefile.am
deleted file mode 100644
index 20aebd3..0000000
--- a/http-launch/src/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-bin_PROGRAMS = http-launch
-
-http_launch_SOURCES = http-launch.c
-http_launch_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS)
-http_launch_LDADD = $(GST_LIBS) $(GIO_LIBS)
-
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..31fa667
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,2 @@
+project('gst-examples', 'c', license : 'LGPL')
+subdir('http-launch')