libs: Add missing single include headers and use them in GIRs

This commit is contained in:
Evan Nemerson 2012-11-20 23:13:33 -08:00 committed by Sebastian Dröge
parent aa777bb315
commit 1afb1f12ef
7 changed files with 81 additions and 9 deletions

View file

@ -26,6 +26,7 @@ libgstbase_@GST_API_VERSION@includedir = \
libgstbase_@GST_API_VERSION@include_HEADERS = \
gstadapter.h \
gstbase.h \
gstbaseparse.h \
gstbasesink.h \
gstbasesrc.h \
@ -71,7 +72,6 @@ BUILT_GIRSOURCES = GstBase-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_API_VERSION@include_HEADERS))
GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
@ -84,7 +84,7 @@ GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERS
-I$(top_srcdir)/libs \
-I$(top_builddir) \
-I$(top_builddir)/libs \
$(gir_cincludes) \
--c-include "gst/base/gstbase.h" \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=libgstbase-@GST_API_VERSION@.la \

39
libs/gst/base/gstbase.h Normal file
View file

@ -0,0 +1,39 @@
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstbase.h: single include header for gst-base library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_BASE_H__
#define __GST_BASE_H__
#include <gst/base/gstadapter.h>
#include <gst/base/gstbaseparse.h>
#include <gst/base/gstbasesink.h>
#include <gst/base/gstbasesrc.h>
#include <gst/base/gstbasetransform.h>
#include <gst/base/gstbitreader.h>
#include <gst/base/gstbytereader.h>
#include <gst/base/gstbytewriter.h>
#include <gst/base/gstcollectpads.h>
#include <gst/base/gstdataqueue.h>
#include <gst/base/gstpushsrc.h>
#include <gst/base/gstqueuearray.h>
#include <gst/base/gsttypefindhelper.h>
#endif /* __GST_BASE_H__ */

View file

@ -127,8 +127,6 @@ BUILT_GIRSOURCES = GstCheck-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@include_HEADERS)) \
$(patsubst %,$(builddir)/%, $(nodist_libgstcheck_@GST_API_VERSION@include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_API_VERSION@include_HEADERS)) \
$(patsubst %,--c-include='gst/check/%',$(nodist_libgstcheck_@GST_API_VERSION@include_HEADERS))
GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
@ -141,7 +139,7 @@ GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VE
-I$(top_srcdir)/libs \
-I$(top_builddir) \
-I$(top_builddir)/libs \
$(gir_cincludes) \
--c-include "gst/check/gstcheck.h" \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=libgstcheck-@GST_API_VERSION@.la \

View file

@ -33,6 +33,10 @@
#include <gst/gst.h>
#include <gst/check/gstbufferstraw.h>
#include <gst/check/gstconsistencychecker.h>
#include <gst/check/gsttestclock.h>
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (check_debug);

View file

@ -3,6 +3,7 @@ lib_LTLIBRARIES = libgstcontroller-@GST_API_VERSION@.la
libgstcontroller_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/controller
libgstcontroller_@GST_API_VERSION@_include_HEADERS = \
gstargbcontrolbinding.h \
gstcontroller.h \
gstdirectcontrolbinding.h \
gsttimedvaluecontrolsource.h \
gstinterpolationcontrolsource.h \
@ -45,7 +46,6 @@ BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_API_VERSION@_include_HEADERS))
GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
@ -58,7 +58,7 @@ GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@
-I$(top_srcdir)/libs \
-I$(top_builddir) \
-I$(top_builddir)/libs \
$(gir_cincludes) \
--c-include "gst/controller/gstcontroller.h" \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=libgstcontroller-@GST_API_VERSION@.la \

View file

@ -0,0 +1,32 @@
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstcontroller.h: single include header for gst-controller library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_CONTROLLER_H__
#define __GST_CONTROLLER_H__
#include <gst/controller/gstargbcontrolbinding.h>
#include <gst/controller/gstdirectcontrolbinding.h>
#include <gst/controller/gsttimedvaluecontrolsource.h>
#include <gst/controller/gstinterpolationcontrolsource.h>
#include <gst/controller/gsttriggercontrolsource.h>
#include <gst/controller/gstlfocontrolsource.h>
#endif /* __GST_CONTROLLER_H__ */

View file

@ -21,10 +21,9 @@
#ifndef __GST_NET_H__
#define __GST_NET_H__
#include <gst/net/gstnetaddressmeta.h>
#include <gst/net/gstnetclientclock.h>
#include <gst/net/gstnettimepacket.h>
#include <gst/net/gstnettimeprovider.h>
#endif /* __GST_NET_H__ */