libs: Use foo/foo.h as single-include header consistently everywhere

https://bugzilla.gnome.org/show_bug.cgi?id=688785
This commit is contained in:
Sebastian Dröge 2012-12-12 16:44:14 +00:00
parent 7518960829
commit e58dabc750
9 changed files with 70 additions and 11 deletions

View file

@ -25,8 +25,8 @@ libgstbase_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_API_VERSION@/gst/base
libgstbase_@GST_API_VERSION@include_HEADERS = \
base.h \
gstadapter.h \
gstbase.h \
gstbaseparse.h \
gstbasesink.h \
gstbasesrc.h \
@ -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 \
--c-include "gst/base/gstbase.h" \
--c-include "gst/base/base.h" \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=libgstbase-@GST_API_VERSION@.la \

View file

@ -1,7 +1,7 @@
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* gstbase.h: single include header for gst-base library
* base.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

View file

@ -28,6 +28,7 @@ libgstcheck_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_API_VERSION@/gst/check
libgstcheck_@GST_API_VERSION@include_HEADERS = \
check.h \
gstbufferstraw.h \
gstcheck.h \
gstconsistencychecker.h \
@ -139,7 +140,7 @@ GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VE
-I$(top_srcdir)/libs \
-I$(top_builddir) \
-I$(top_builddir)/libs \
--c-include "gst/check/gstcheck.h" \
--c-include "gst/check/check.h" \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=libgstcheck-@GST_API_VERSION@.la \

30
libs/gst/check/check.h Normal file
View file

@ -0,0 +1,30 @@
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* check.h: single include header for gst-check 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_CHECK__H__
#define __GST_CHECK__H__
#include <gst/check/gstbufferstraw.h>
#include <gst/check/gstcheck.h>
#include <gst/check/gstconsistencychecker.h>
#include <gst/check/gsttestclock.h>
#endif /* __GST_CHECK__H__ */

View file

@ -33,10 +33,6 @@
#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

@ -2,8 +2,8 @@ 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 = \
controller.h \
gstargbcontrolbinding.h \
gstcontroller.h \
gstdirectcontrolbinding.h \
gsttimedvaluecontrolsource.h \
gstinterpolationcontrolsource.h \
@ -58,7 +58,7 @@ GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@
-I$(top_srcdir)/libs \
-I$(top_builddir) \
-I$(top_builddir)/libs \
--c-include "gst/controller/gstcontroller.h" \
--c-include "gst/controller/controller.h" \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=libgstcontroller-@GST_API_VERSION@.la \

View file

@ -2,6 +2,7 @@ lib_LTLIBRARIES = libgstnet-@GST_API_VERSION@.la
libgstnet_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/net
libgstnet_@GST_API_VERSION@_include_HEADERS = \
net.h \
gstnet.h \
gstnetaddressmeta.h \
gstnetclientclock.h \
@ -43,7 +44,7 @@ BUILT_GIRSOURCES = GstNet-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_API_VERSION@_include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=--c-include="gst/net/gstnet.h"
gir_cincludes=--c-include="gst/net/net.h"
GstNet-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \

31
libs/gst/net/net.h Normal file
View file

@ -0,0 +1,31 @@
/* GStreamer
* Copyright (C) 2012 GStreamer developers
*
* net.h: single include header for gst-net 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_NET__H__
#define __GST_NET__H__
#include <gst/net/gstnet.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__ */