[librsvg: 1/5] (#645) - Make include paths happy again

From: Federico Mena Quintero <federico src gnome org>
To: commits-list gnome org
Cc:
Subject: [librsvg: 1/5] (#645) - Make include paths happy again
Date: Fri, 6 Nov 2020 17:42:07 +0000 (UTC)

commit 6dae695f8770cf122fc75f8fcfda95c53e4ae742
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Nov 5 15:10:14 2020 -0600

    (#645) - Make include paths happy again
    
    Move headers to include/librsvg/*.h to keep both gtk-doc and
    g-ir-scanner happy.  We want to end up with a Rsvg-2.0.gir with a line
    like
    
      <c:include name="librsvg/rsvg.h"/>
    
    Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/645

 Makefile.am                             |  7 +++++--
 configure.ac                            |  4 ++--
 doc/Makefile.am                         |  5 +++--
 doc/rsvg.types                          |  2 +-
 gdk-pixbuf-loader/Makefile.am           |  5 +++++
 gdk-pixbuf-loader/io-svg.c              |  2 +-
 include/{ => librsvg}/rsvg-cairo.h      |  0
 include/{ => librsvg}/rsvg-css.h        |  0
 include/{ => librsvg}/rsvg-features.h   |  0
 include/{ => librsvg}/rsvg-version.h.in |  0
 include/{ => librsvg}/rsvg.h            |  0
 rsvg-c-srcs.mk                          | 14 +++++++-------
 rsvg-convert.c                          |  4 ++--
 tests/Makefile.am                       |  1 +
 tests/api.c                             |  2 +-
 15 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3d6a8246..3e8d113a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,6 +196,7 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(top_builddir)                       \
        -I$(top_builddir)/include               \
+       -I$(top_builddir)/include/librsvg       \
        -DG_LOG_DOMAIN=\"librsvg\"              \
        -DLIBRSVG_DATADIR="\"$(datadir)\""      \
        -DSRCDIR=\""${abs_top_srcdir}"\"        \
@@ -232,8 +233,10 @@ rsvg_convert_SOURCES =                     \
 
 rsvg_convert_CPPFLAGS = \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/include                 \
        -I$(top_builddir)                       \
        -I$(top_builddir)/include               \
+       -I$(top_builddir)/include/librsvg       \
        -DLIBRSVG_DATADIR="\"$(datadir)\""      \
        $(AM_CPPFLAGS)
 
@@ -300,9 +303,9 @@ Rsvg_@RSVG_API_VERSION_U@_gir_PACKAGES = \
        pango \
        libxml-2.0 \
        $(NULL)
-Rsvg_@RSVG_API_VERSION_U@_gir_CFLAGS = -I$(top_builddir) -I$(top_builddir)/include -DRSVG_COMPILATION
+Rsvg_@RSVG_API_VERSION_U@_gir_CFLAGS = -I$(top_builddir) -I$(top_builddir)/include 
-I$(top_builddir)/include/librsvg -DRSVG_COMPILATION
 Rsvg_@RSVG_API_VERSION_U@_gir_LIBS = librsvg-@RSVG_API_MAJOR_VERSION@.la
-Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS = --c-include="include/rsvg.h"
+Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS = --c-include="librsvg/rsvg.h"
 
 girdir = $(datadir)/gir-1.0
 nodist_gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/configure.ac b/configure.ac
index b29860ff..086da6fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([rsvg_lt_version_info],rsvg_lt_current:rsvg_lt_revision:rsvg_lt_age)
 AC_INIT([RSVG],[rsvg_version],[https://gitlab.gnome.org/GNOME/librsvg/issues],[librsvg])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([include/rsvg.h])
+AC_CONFIG_SRCDIR([include/librsvg/rsvg.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz tar-ustar subdir-objects])
@@ -363,7 +363,7 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
 AC_CONFIG_FILES([
-include/rsvg-version.h
+include/librsvg/rsvg-version.h
 Makefile
 librsvg-zip
 gdk-pixbuf-loader/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 29c3b743..a9c92872 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,13 +52,13 @@ FIXXREF_OPTIONS = \
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB = $(top_srcdir)/include/*.h
+HFILE_GLOB = $(top_srcdir)/include/librsvg/*.h
 CFILE_GLOB =
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
 # EXTRA_HFILES = $(top_builddir)/evdocument/ev-version.h
-EXTRA_HFILES = $(top_builddir)/include/rsvg-version.h
+EXTRA_HFILES = $(top_builddir)/include/librsvg/rsvg-version.h
 
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -89,6 +89,7 @@ expand_content_files =
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS =                                        \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/include                 \
        -I$(top_builddir)                       \
        -I$(top_builddir)/include               \
        $(LIBRSVG_CFLAGS)                       \
diff --git a/doc/rsvg.types b/doc/rsvg.types
index 2b1e2192..298f4d33 100644
--- a/doc/rsvg.types
+++ b/doc/rsvg.types
@@ -1,3 +1,3 @@
-#include <include/rsvg.h>
+#include <librsvg/rsvg.h>
 
 rsvg_handle_get_type
diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am
index 28e04d63..b71801c8 100644
--- a/gdk-pixbuf-loader/Makefile.am
+++ b/gdk-pixbuf-loader/Makefile.am
@@ -9,8 +9,10 @@ libpixbufloader_svg_la_SOURCES = \
 
 libpixbufloader_svg_la_CPPFLAGS = \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/include                 \
        -I$(top_builddir)                       \
        -I$(top_builddir)/include               \
+       -I$(top_builddir)/include/librsvg       \
        -DGDK_PIXBUF_ENABLE_BACKEND             \
        -DG_LOG_DOMAIN=\"libpixbufloader-svg\"  \
        $(AM_CPPFLAGS)
@@ -38,7 +40,10 @@ rsvg_loader_SOURCES = \
        $(NULL)
 rsvg_loader_CPPFLAGS = \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/include                 \
        -I$(top_builddir)                       \
+       -I$(top_builddir)/include               \
+       -I$(top_builddir)/include/librsvg       \
        $(AM_CPPFLAGS)
 rsvg_loader_CFLAGS = \
        $(GDK_PIXBUF_CFLAGS) \
diff --git a/gdk-pixbuf-loader/io-svg.c b/gdk-pixbuf-loader/io-svg.c
index 8a404417..a8577d0b 100644
--- a/gdk-pixbuf-loader/io-svg.c
+++ b/gdk-pixbuf-loader/io-svg.c
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 
-#include "include/rsvg.h"
+#include "librsvg/rsvg.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #define N_(string) (string)
diff --git a/include/rsvg-cairo.h b/include/librsvg/rsvg-cairo.h
similarity index 100%
rename from include/rsvg-cairo.h
rename to include/librsvg/rsvg-cairo.h
diff --git a/include/rsvg-css.h b/include/librsvg/rsvg-css.h
similarity index 100%
rename from include/rsvg-css.h
rename to include/librsvg/rsvg-css.h
diff --git a/include/rsvg-features.h b/include/librsvg/rsvg-features.h
similarity index 100%
rename from include/rsvg-features.h
rename to include/librsvg/rsvg-features.h
diff --git a/include/rsvg-version.h.in b/include/librsvg/rsvg-version.h.in
similarity index 100%
rename from include/rsvg-version.h.in
rename to include/librsvg/rsvg-version.h.in
diff --git a/include/rsvg.h b/include/librsvg/rsvg.h
similarity index 100%
rename from include/rsvg.h
rename to include/librsvg/rsvg.h
diff --git a/rsvg-c-srcs.mk b/rsvg-c-srcs.mk
index 917fcc86..a9a06d4d 100644
--- a/rsvg-c-srcs.mk
+++ b/rsvg-c-srcs.mk
@@ -1,12 +1,12 @@
-librsvg_public_headers =       \
-       include/rsvg.h          \
-       include/rsvg-cairo.h    \
-       include/rsvg-features.h \
-       include/rsvg-version.h  \
+librsvg_public_headers =               \
+       include/librsvg/rsvg.h          \
+       include/librsvg/rsvg-cairo.h    \
+       include/librsvg/rsvg-features.h \
+       include/librsvg/rsvg-version.h  \
        $(NULL)
 
-librsvg_private_headers =      \
-       include/rsvg-css.h      \
+librsvg_private_headers =              \
+       include/librsvg/rsvg-css.h      \
        $(NULL)
 
 rsvg_convert_srcs = rsvg-convert.c
diff --git a/rsvg-convert.c b/rsvg-convert.c
index 53d60732..cb17345d 100644
--- a/rsvg-convert.c
+++ b/rsvg-convert.c
@@ -56,8 +56,8 @@
 #include <gio/gwin32inputstream.h>
 #endif
 
-#include "include/rsvg-css.h"
-#include "include/rsvg.h"
+#include "librsvg/rsvg-css.h"
+#include "librsvg/rsvg.h"
 
 #ifdef CAIRO_HAS_PS_SURFACE
 #include <cairo-ps.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a73173c8..edb3c256 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -35,6 +35,7 @@ LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la   \
 AM_CPPFLAGS =                                  \
        -I$(srcdir)                             \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/include                 \
        -I$(top_builddir)/include               \
        -DTEST_DATA_DIR="\"$(srcdir)\""         \
        -DTEST_SRC_DIR="\"$(PWD)\""             \
diff --git a/tests/api.c b/tests/api.c
index b63fd1c4..d4f53b88 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -17,7 +17,7 @@
 #include <cairo.h>
 
 #define RSVG_DISABLE_DEPRECATION_WARNINGS /* so we can test deprecated API */
-#include "include/rsvg.h"
+#include "librsvg/rsvg.h"
 #include "test-utils.h"
 
 /*
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]