diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2020-11-05 15:10:14 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2020-11-06 11:30:44 -0600 |
| commit | 6dae695f8770cf122fc75f8fcfda95c53e4ae742 (patch) | |
| tree | 61a99fb2cf8f789110387e324135639383df6b64 /Makefile.am | |
| parent | 22d38f2f892504dba6bd45ff97b622ecdcd23fa2 (diff) | |
| download | librsvg-6dae695f8770cf122fc75f8fcfda95c53e4ae742.tar.gz | |
(#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
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 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) |