ges: Don't install ges-internal.h and hide the GES debug category symbols

Fixes bug #639219.

diff --git a/ges/Makefile.am b/ges/Makefile.am
index b37cca2..854fb39 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -51,7 +51,6 @@ libges_@GST_MAJORMINOR@include_HEADERS =      \
        ges.h                                   \
        ges-enums.h                             \
        ges-custom-timeline-source.h            \
-       ges-internal.h                          \
        ges-simple-timeline-layer.h             \
        ges-timeline.h                          \
        ges-timeline-layer.h                    \
@@ -84,6 +83,9 @@ libges_@GST_MAJORMINOR@include_HEADERS =      \
        ges-keyfile-formatter.h                 \
        ges-utils.h
 
+noinst_HEADERS = \
+       ges-internal.h
+
 libges_@GST_MAJORMINOR@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libges_@GST_MAJORMINOR@_la_LIBADD = $(GST_PBUTILS_LIBS) $(GST_VIDEO_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) 
 libges_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -export-symbols-regex \^_*\(ges_\|GES_\).*

diff --git a/ges/ges-internal.h b/ges/ges-internal.h
index cd8a2ba..a104dae 100644 (file)
--- a/ges/ges-internal.h
+++ b/ges/ges-internal.h
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 
-GST_DEBUG_CATEGORY_EXTERN (ges_debug);
-#define GST_CAT_DEFAULT ges_debug
+GST_DEBUG_CATEGORY_EXTERN (_ges_debug);
+#define GST_CAT_DEFAULT _ges_debug
 
 #endif /* __GES_INTERNAL_H__ */

diff --git a/ges/ges.c b/ges/ges.c
index 931b88a..3631bde 100644 (file)
--- a/ges/ges.c
+++ b/ges/ges.c
@@ -22,7 +22,7 @@
 #include <gst/controller/gstcontroller.h>
 #include "ges-internal.h"
 
-GST_DEBUG_CATEGORY (ges_debug);
+GST_DEBUG_CATEGORY (_ges_debug);
 
 /**
  * SECTION:ges-common
@@ -40,7 +40,7 @@ void
 ges_init (void)
 {
   /* initialize debugging category */
-  GST_DEBUG_CATEGORY_INIT (ges_debug, "ges", GST_DEBUG_FG_YELLOW,
+  GST_DEBUG_CATEGORY_INIT (_ges_debug, "ges", GST_DEBUG_FG_YELLOW,
       "GStreamer Editing Services");
   gst_controller_init (NULL, NULL);