From 6e5888853e22cb69193ae6353cd19d4a7ad689b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Apr 2016 15:15:32 +0200 Subject: [PATCH] build: Export correct pkg-config names in .girs --- clutter/clutter/Makefile.am | 6 +++--- cogl/cogl-pango/Makefile.am | 4 ++-- cogl/cogl/Makefile.am | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am index ff4022c77..599ec58be 100644 --- a/clutter/clutter/Makefile.am +++ b/clutter/clutter/Makefile.am @@ -643,7 +643,7 @@ Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cog Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ --warn-all \ --c-include='clutter/clutter.h' \ - --pkg-export=clutter-@CLUTTER_API_VERSION@ + --pkg-export=mutter-clutter-@CLUTTER_API_VERSION@ INTROSPECTION_GIRS += Clutter-@CLUTTER_API_VERSION@.gir @@ -657,7 +657,7 @@ Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ --warn-all \ --c-include='cally/cally.h' \ - --pkg-export=cally-@CLUTTER_API_VERSION@ \ + --pkg-export=mutter-cally-@CLUTTER_API_VERSION@ \ --include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir INTROSPECTION_GIRS += Cally-@CLUTTER_API_VERSION@.gir @@ -672,7 +672,7 @@ ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \ --warn-all \ --c-include='clutter/x11/clutter-x11.h' \ - --pkg-export=clutter-x11-@CLUTTER_API_VERSION@ \ + --pkg-export=mutter-clutter-x11-@CLUTTER_API_VERSION@ \ --include-uninstalled=$(top_builddir)/clutter/Clutter-@CLUTTER_API_VERSION@.gir INTROSPECTION_GIRS += ClutterX11-@CLUTTER_API_VERSION@.gir diff --git a/cogl/cogl-pango/Makefile.am b/cogl/cogl-pango/Makefile.am index e32ad26a5..562d81030 100644 --- a/cogl/cogl-pango/Makefile.am +++ b/cogl/cogl-pango/Makefile.am @@ -73,7 +73,7 @@ CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-p CoglPango_1_0_gir_FILES = $(source_h) $(source_c) CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0 -CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0 +CoglPango_1_0_gir_EXPORT_PACKAGES = mutter-cogl-pango-1.0 CoglPango_1_0_gir_SCANNERFLAGS = \ --warn-all \ --identifier-prefix=CoglPango \ @@ -89,7 +89,7 @@ CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-p CoglPango_2_0_gir_FILES = $(source_h) $(source_c) CoglPango_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) CoglPango_2_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0 -CoglPango_2_0_gir_EXPORT_PACKAGES = cogl-pango-2.0-experimental +CoglPango_2_0_gir_EXPORT_PACKAGES = mutter-cogl-pango-2.0-experimental CoglPango_2_0_gir_SCANNERFLAGS = \ --warn-all \ --identifier-prefix=CoglPango \ diff --git a/cogl/cogl/Makefile.am b/cogl/cogl/Makefile.am index e34c76806..cc8e7a47c 100644 --- a/cogl/cogl/Makefile.am +++ b/cogl/cogl/Makefile.am @@ -527,12 +527,12 @@ Cogl_2_0_gir_FILES = $(cogl_experimental_h) $(cogl_additional_experimental_h) co Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API -UCOGL_ENABLE_EXPERIMENTAL_2_0_API -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0 -Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0 +Cogl_1_0_gir_EXPORT_PACKAGES = mutter-cogl-1.0 Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' Cogl_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -DCOGL_ENABLE_EXPERIMENTAL_API=1 -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -DCOGL_GIR_SCANNING Cogl_2_0_gir_INCLUDES = GL-1.0 GObject-2.0 -Cogl_2_0_gir_EXPORT_PACKAGES = cogl-2.0-experimental +Cogl_2_0_gir_EXPORT_PACKAGES = mutter-cogl-2.0-experimental Cogl_2_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' --symbol-prefix=cogl --symbol-prefix=cogl2 INTROSPECTION_GIRS += Cogl-1.0.gir Cogl-2.0.gir