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

https://bugzilla.gnome.org/show_bug.cgi?id=688785

diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index 4c632d7..e4d777c 100644 (file)
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -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 \

diff --git a/libs/gst/base/gstbase.h b/libs/gst/base/base.h
similarity index 95%
rename from libs/gst/base/gstbase.h
rename to libs/gst/base/base.h
index 3aefc7a..e741145 100644 (file)
--- a/libs/gst/base/gstbase.h
+++ b/libs/gst/base/base.h
@@ -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

diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am
index bd2a1b8..26fbaa5 100644 (file)
--- a/libs/gst/check/Makefile.am
+++ b/libs/gst/check/Makefile.am
@@ -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 \

diff --git a/libs/gst/check/check.h b/libs/gst/check/check.h
new file mode 100644 (file)
index 0000000..554ff93
--- /dev/null
+++ b/libs/gst/check/check.h
@@ -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__ */

diff --git a/libs/gst/check/gstcheck.h b/libs/gst/check/gstcheck.h
index 7e380c7..0ff3c6b 100644 (file)
--- a/libs/gst/check/gstcheck.h
+++ b/libs/gst/check/gstcheck.h
@@ -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);

diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am
index 70b62d5..17976ea 100644 (file)
--- a/libs/gst/controller/Makefile.am
+++ b/libs/gst/controller/Makefile.am
@@ -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 \

diff --git a/libs/gst/controller/gstcontroller.h b/libs/gst/controller/controller.h
similarity index 100%
rename from libs/gst/controller/gstcontroller.h
rename to libs/gst/controller/controller.h

diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am
index 1870d83..18bfb7d 100644 (file)
--- a/libs/gst/net/Makefile.am
+++ b/libs/gst/net/Makefile.am
@@ -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)" \

diff --git a/libs/gst/net/net.h b/libs/gst/net/net.h
new file mode 100644 (file)
index 0000000..1ef53d6
--- /dev/null
+++ b/libs/gst/net/net.h
@@ -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__ */