GNOME.org
 

[librsvg: 2/11] Move the C part of the library to a librsvg/ subdirectory

commit 9cb0bb85ab5c05e54f34b64148b419ed1bbd6701
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Feb 22 19:09:12 2018 -0600

    Move the C part of the library to a librsvg/ subdirectory
    
    Avoid having everything in the toplevel.  Modified source files to

 Makefile.am                                        | 138 ++++++++++-----------
 configure.ac                                       |   6 +-
 gdk-pixbuf-loader/io-svg.c                         |   2 +-
 librsvg-features.c => librsvg/librsvg-features.c   |   0
 .../librsvg-features.h.in                          |   0
 rsvg-attributes.h => librsvg/rsvg-attributes.h     |   0
 .../rsvg-base-file-util.c                          |   0
 rsvg-base.c => librsvg/rsvg-base.c                 |   0
 rsvg-cairo-clip.c => librsvg/rsvg-cairo-clip.c     |   0
 rsvg-cairo-clip.h => librsvg/rsvg-cairo-clip.h     |   0
 rsvg-cairo-draw.c => librsvg/rsvg-cairo-draw.c     |   0
 rsvg-cairo-draw.h => librsvg/rsvg-cairo-draw.h     |   0
 rsvg-cairo-render.c => librsvg/rsvg-cairo-render.c |   0
 rsvg-cairo-render.h => librsvg/rsvg-cairo-render.h |   0
 rsvg-cairo.h => librsvg/rsvg-cairo.h               |   0
 rsvg-cond.c => librsvg/rsvg-cond.c                 |   0
 rsvg-css.c => librsvg/rsvg-css.c                   |   0
 rsvg-css.h => librsvg/rsvg-css.h                   |   0
 rsvg-defs.c => librsvg/rsvg-defs.c                 |   0
 rsvg-defs.h => librsvg/rsvg-defs.h                 |   0
 rsvg-file-util.c => librsvg/rsvg-file-util.c       |   0
 rsvg-filter.c => librsvg/rsvg-filter.c             |   0
 rsvg-filter.h => librsvg/rsvg-filter.h             |   0
 rsvg-handle.c => librsvg/rsvg-handle.c             |   0
 rsvg-io.c => librsvg/rsvg-io.c                     |   0
 rsvg-io.h => librsvg/rsvg-io.h                     |   0
 rsvg-marker.h => librsvg/rsvg-marker.h             |   0
 rsvg-mask.h => librsvg/rsvg-mask.h                 |   0
 rsvg-paint-server.h => librsvg/rsvg-paint-server.h |   0
 rsvg-path-builder.h => librsvg/rsvg-path-builder.h |   0
 rsvg-private.h => librsvg/rsvg-private.h           |   0
 rsvg-shapes.h => librsvg/rsvg-shapes.h             |   0
 .../rsvg-size-callback.c                           |   0
 .../rsvg-size-callback.h                           |   0
 rsvg-structure.h => librsvg/rsvg-structure.h       |   0
 rsvg-styles.c => librsvg/rsvg-styles.c             |   0
 rsvg-styles.h => librsvg/rsvg-styles.h             |   0
 rsvg-text.c => librsvg/rsvg-text.c                 |   0
 rsvg-text.h => librsvg/rsvg-text.h                 |   0
 rsvg-xml.c => librsvg/rsvg-xml.c                   |   0
 rsvg-xml.h => librsvg/rsvg-xml.h                   |   0
 rsvg.h => librsvg/rsvg.h                           |   0
 rsvg-convert.c                                     |   6 +-
 rsvg-view.c                                        |   4 +-
 tests/Makefile.am                                  |  19 +--
 tests/api.c                                        |   2 +-
 tests/crash.c                                      |   2 +-
 tests/dimensions.c                                 |   2 +-
 tests/loading.c                                    |   2 +-
 tests/render-crash.c                               |   2 +-
 tests/rsvg-test.c                                  |   2 +-
 tests/styles.c                                     |  10 +-
 tools/Makefile.am                                  |   2 +-
 tools/rsvg-dimensions.c                            |   2 +-
 tools/rsvg-tools-main.c                            |   4 +-
 55 files changed, 103 insertions(+), 102 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 83a4c42f..f8b92c89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,57 +10,57 @@ if HAVE_GTK_3
 bin_PROGRAMS += rsvg-view-3
 endif
 
-headers = \
-       rsvg.h  \
-       rsvg-cairo.h
+headers =                      \
+       librsvg/rsvg.h          \
+       librsvg/rsvg-cairo.h
 
-enum_sources = \
-       librsvg-enum-types.h    \
-       librsvg-enum-types.c
+enum_sources =                                 \
+       librsvg/librsvg-enum-types.h    \
+       librsvg/librsvg-enum-types.c
 BUILT_SOURCES += $(enum_sources)
 
-librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES = \
-       librsvg-enum-types.c    \
-       librsvg-enum-types.h    \
-       librsvg-features.c      \
-       librsvg-features.h      \
-       rsvg-attributes.h       \
-       rsvg-base-file-util.c   \
-       rsvg-base.c             \
-       rsvg-cairo-clip.c       \
-       rsvg-cairo-clip.h       \
-       rsvg-cairo-draw.c       \
-       rsvg-cairo-draw.h       \
-       rsvg-cairo-render.c     \
-       rsvg-cairo-render.h     \
-       rsvg-cairo.h            \
-       rsvg-cond.c             \
-       rsvg-css.c              \
-       rsvg-css.h              \
-       rsvg-defs.c             \
-       rsvg-defs.h             \
-       rsvg-file-util.c        \
-       rsvg-filter.c           \
-       rsvg-filter.h           \
-       rsvg-handle.c           \
-       rsvg-io.c               \
-       rsvg-io.h               \
-       rsvg-marker.h           \
-       rsvg-mask.h             \
-       rsvg-paint-server.h     \
-       rsvg-path-builder.h     \
-       rsvg-private.h          \
-       rsvg-shapes.h           \
-       rsvg-size-callback.c    \
-       rsvg-size-callback.h    \
-       rsvg-structure.h        \
-       rsvg-styles.c           \
-       rsvg-styles.h           \
-       rsvg-text.c             \
-       rsvg-text.h             \
-       rsvg-xml.c              \
-       rsvg-xml.h              \
-       rsvg.h                  \
+librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES =  \
+       librsvg/librsvg-enum-types.c            \
+       librsvg/librsvg-enum-types.h            \
+       librsvg/librsvg-features.c              \
+       librsvg/librsvg-features.h              \
+       librsvg/rsvg-attributes.h               \
+       librsvg/rsvg-base-file-util.c           \
+       librsvg/rsvg-base.c                     \
+       librsvg/rsvg-cairo-clip.c               \
+       librsvg/rsvg-cairo-clip.h               \
+       librsvg/rsvg-cairo-draw.c               \
+       librsvg/rsvg-cairo-draw.h               \
+       librsvg/rsvg-cairo-render.c             \
+       librsvg/rsvg-cairo-render.h             \
+       librsvg/rsvg-cairo.h                    \
+       librsvg/rsvg-cond.c                     \
+       librsvg/rsvg-css.c                      \
+       librsvg/rsvg-css.h                      \
+       librsvg/rsvg-defs.c                     \
+       librsvg/rsvg-defs.h                     \
+       librsvg/rsvg-file-util.c                \
+       librsvg/rsvg-filter.c                   \
+       librsvg/rsvg-filter.h                   \
+       librsvg/rsvg-handle.c                   \
+       librsvg/rsvg-io.c                       \
+       librsvg/rsvg-io.h                       \
+       librsvg/rsvg-marker.h                   \
+       librsvg/rsvg-mask.h                     \
+       librsvg/rsvg-paint-server.h             \
+       librsvg/rsvg-path-builder.h             \
+       librsvg/rsvg-private.h                  \
+       librsvg/rsvg-shapes.h                   \
+       librsvg/rsvg-size-callback.c            \
+       librsvg/rsvg-size-callback.h            \
+       librsvg/rsvg-structure.h                \
+       librsvg/rsvg-styles.c                   \
+       librsvg/rsvg-styles.h                   \
+       librsvg/rsvg-text.c                     \
+       librsvg/rsvg-text.h                     \
+       librsvg/rsvg-xml.c                      \
+       librsvg/rsvg-xml.h                      \
+       librsvg/rsvg.h                          \
        $(NULL)
 
 RUST_SOURCES =                                         \
@@ -173,17 +173,17 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
        $(RUST_LIB)
 
 librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
-librsvginc_HEADERS =   \
-       $(headers)      \
-       librsvg-features.h \
-       librsvg-enum-types.h
+librsvginc_HEADERS =                   \
+       $(headers)                      \
+       librsvg/librsvg-features.h      \
+       librsvg/librsvg-enum-types.h
 
 dist_man_MANS = rsvg-convert.1
 
-rsvg_convert_SOURCES = \
-       rsvg-convert.c \
-       rsvg-size-callback.c \
-       rsvg-size-callback.h \
+rsvg_convert_SOURCES =                 \
+       rsvg-convert.c                  \
+       librsvg/rsvg-size-callback.c    \
+       librsvg/rsvg-size-callback.h    \
        $(NULL)
 
 rsvg_convert_CPPFLAGS = \
@@ -203,9 +203,9 @@ rsvg_convert_LDADD = \
        $(RSVG_CONVERT_LIBS) \
        $(LIBM)
 
-rsvg_view_3_SOURCES = \
-       rsvg-view.c \
-       rsvg-size-callback.h
+rsvg_view_3_SOURCES =                  \
+       rsvg-view.c                     \
+       librsvg/rsvg-size-callback.h
 
 rsvg_view_3_CPPFLAGS = \
        -I$(top_srcdir)                         \
@@ -265,33 +265,33 @@ CLEANFILES = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = librsvg-$(RSVG_API_VERSION).pc
 
-librsvg-enum-types.h: s-enum-types-h
+librsvg/librsvg-enum-types.h: librsvg/s-enum-types-h
        @true
 
-s-enum-types-h: $(headers) Makefile
+librsvg/s-enum-types-h: $(headers) Makefile
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
                        --fhead "#if !defined (__RSVG_RSVG_H_INSIDE__) && !defined 
(RSVG_COMPILATION)\n#warning \"Including <librsvg/librsvg-enum-types.h> directly is 
deprecated.\"\n#endif\n\n#ifndef __LIBRSVG_ENUM_TYPES_H__\n#define __LIBRSVG_ENUM_TYPES_H__\n\n#include 
<glib-object.h>\n\nG_BEGIN_DECLS\n" \
                        --fprod "/* enumerations from \"@filename@\" */\n" \
                        --vhead "GType @enum_name@_get_type (void);\n#define RSVG_TYPE_@ENUMSHORT@ 
(@enum_name@_get_type())\n"  \
                        --ftail "G_END_DECLS\n\n#endif /* __LIBRSVG_ENUM_TYPES_H__ */" \
-               $(headers) ) > tmp-librsvg-enum-types.h \
-       && (cmp -s tmp-librsvg-enum-types.h librsvg-enum-types.h || cp tmp-librsvg-enum-types.h 
librsvg-enum-types.h ) \
-       && rm -f tmp-librsvg-enum-types.h       \
+               $(headers) ) > librsvg/tmp-librsvg-enum-types.h \
+       && (cmp -s librsvg/tmp-librsvg-enum-types.h librsvg/librsvg-enum-types.h || cp 
librsvg/tmp-librsvg-enum-types.h librsvg/librsvg-enum-types.h ) \
+       && rm -f librsvg/tmp-librsvg-enum-types.h       \
        && echo timestamp > $(@F)
 
-librsvg-enum-types.c: s-enum-types-c librsvg-enum-types.h
+librsvg/librsvg-enum-types.c: librsvg/s-enum-types-c librsvg/librsvg-enum-types.h
        @true
 
-s-enum-types-c: $(headers) Makefile
+librsvg/s-enum-types-c: $(headers) Makefile
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
                        --fhead "#include \"rsvg.h\"" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if 
(etype == 0) {\n    static const G@Type@Value values[] = {"     \
                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
                        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static 
(\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-               $(headers) ) > tmp-librsvg-enum-types.c \
-       && (cmp -s tmp-librsvg-enum-types.c librsvg-enum-types.c || cp tmp-librsvg-enum-types.c 
librsvg-enum-types.c ) \
-       && rm -f tmp-librsvg-enum-types.c \
+               $(headers) ) > librsvg/tmp-librsvg-enum-types.c \
+       && (cmp -s librsvg/tmp-librsvg-enum-types.c librsvg/librsvg-enum-types.c || cp 
librsvg/tmp-librsvg-enum-types.c librsvg/librsvg-enum-types.c ) \
+       && rm -f librsvg/tmp-librsvg-enum-types.c \
        && echo timestamp > $(@F)
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 9379be51..99d6b8dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ m4_define([rsvg_lt_version_info],m4_eval(rsvg_major_version + rsvg_minor_version
 AC_INIT([RSVG],[rsvg_version],[https://gitlab.gnome.org/GNOME/librsvg/issues],[librsvg])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([rsvg.h])
+AC_CONFIG_SRCDIR([librsvg/rsvg.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz tar-ustar])
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz tar-ustar subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AM_MAINTAINER_MODE([enable])
@@ -331,7 +331,7 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
 AC_CONFIG_FILES([
-librsvg-features.h
+librsvg/librsvg-features.h
 Makefile
 librsvg-zip
 gdk-pixbuf-loader/Makefile
diff --git a/gdk-pixbuf-loader/io-svg.c b/gdk-pixbuf-loader/io-svg.c
index 98f9580a..22689eb9 100644
--- a/gdk-pixbuf-loader/io-svg.c
+++ b/gdk-pixbuf-loader/io-svg.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include <rsvg.h>
+#include "librsvg/rsvg.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #define N_(string) (string)
diff --git a/librsvg-features.c b/librsvg/librsvg-features.c
similarity index 100%
rename from librsvg-features.c
rename to librsvg/librsvg-features.c
diff --git a/librsvg-features.h.in b/librsvg/librsvg-features.h.in
similarity index 100%
rename from librsvg-features.h.in
rename to librsvg/librsvg-features.h.in
diff --git a/rsvg-attributes.h b/librsvg/rsvg-attributes.h
similarity index 100%
rename from rsvg-attributes.h
rename to librsvg/rsvg-attributes.h
diff --git a/rsvg-base-file-util.c b/librsvg/rsvg-base-file-util.c
similarity index 100%
rename from rsvg-base-file-util.c
rename to librsvg/rsvg-base-file-util.c
diff --git a/rsvg-base.c b/librsvg/rsvg-base.c
similarity index 100%
rename from rsvg-base.c
rename to librsvg/rsvg-base.c
diff --git a/rsvg-cairo-clip.c b/librsvg/rsvg-cairo-clip.c
similarity index 100%
rename from rsvg-cairo-clip.c
rename to librsvg/rsvg-cairo-clip.c
diff --git a/rsvg-cairo-clip.h b/librsvg/rsvg-cairo-clip.h
similarity index 100%
rename from rsvg-cairo-clip.h
rename to librsvg/rsvg-cairo-clip.h
diff --git a/rsvg-cairo-draw.c b/librsvg/rsvg-cairo-draw.c
similarity index 100%
rename from rsvg-cairo-draw.c
rename to librsvg/rsvg-cairo-draw.c
diff --git a/rsvg-cairo-draw.h b/librsvg/rsvg-cairo-draw.h
similarity index 100%
rename from rsvg-cairo-draw.h
rename to librsvg/rsvg-cairo-draw.h
diff --git a/rsvg-cairo-render.c b/librsvg/rsvg-cairo-render.c
similarity index 100%
rename from rsvg-cairo-render.c
rename to librsvg/rsvg-cairo-render.c
diff --git a/rsvg-cairo-render.h b/librsvg/rsvg-cairo-render.h
similarity index 100%
rename from rsvg-cairo-render.h
rename to librsvg/rsvg-cairo-render.h
diff --git a/rsvg-cairo.h b/librsvg/rsvg-cairo.h
similarity index 100%
rename from rsvg-cairo.h
rename to librsvg/rsvg-cairo.h
diff --git a/rsvg-cond.c b/librsvg/rsvg-cond.c
similarity index 100%
rename from rsvg-cond.c
rename to librsvg/rsvg-cond.c
diff --git a/rsvg-css.c b/librsvg/rsvg-css.c
similarity index 100%
rename from rsvg-css.c
rename to librsvg/rsvg-css.c
diff --git a/rsvg-css.h b/librsvg/rsvg-css.h
similarity index 100%
rename from rsvg-css.h
rename to librsvg/rsvg-css.h
diff --git a/rsvg-defs.c b/librsvg/rsvg-defs.c
similarity index 100%
rename from rsvg-defs.c
rename to librsvg/rsvg-defs.c
diff --git a/rsvg-defs.h b/librsvg/rsvg-defs.h
similarity index 100%
rename from rsvg-defs.h
rename to librsvg/rsvg-defs.h
diff --git a/rsvg-file-util.c b/librsvg/rsvg-file-util.c
similarity index 100%
rename from rsvg-file-util.c
rename to librsvg/rsvg-file-util.c
diff --git a/rsvg-filter.c b/librsvg/rsvg-filter.c
similarity index 100%
rename from rsvg-filter.c
rename to librsvg/rsvg-filter.c
diff --git a/rsvg-filter.h b/librsvg/rsvg-filter.h
similarity index 100%
rename from rsvg-filter.h
rename to librsvg/rsvg-filter.h
diff --git a/rsvg-handle.c b/librsvg/rsvg-handle.c
similarity index 100%
rename from rsvg-handle.c
rename to librsvg/rsvg-handle.c
diff --git a/rsvg-io.c b/librsvg/rsvg-io.c
similarity index 100%
rename from rsvg-io.c
rename to librsvg/rsvg-io.c
diff --git a/rsvg-io.h b/librsvg/rsvg-io.h
similarity index 100%
rename from rsvg-io.h
rename to librsvg/rsvg-io.h
diff --git a/rsvg-marker.h b/librsvg/rsvg-marker.h
similarity index 100%
rename from rsvg-marker.h
rename to librsvg/rsvg-marker.h
diff --git a/rsvg-mask.h b/librsvg/rsvg-mask.h
similarity index 100%
rename from rsvg-mask.h
rename to librsvg/rsvg-mask.h
diff --git a/rsvg-paint-server.h b/librsvg/rsvg-paint-server.h
similarity index 100%
rename from rsvg-paint-server.h
rename to librsvg/rsvg-paint-server.h
diff --git a/rsvg-path-builder.h b/librsvg/rsvg-path-builder.h
similarity index 100%
rename from rsvg-path-builder.h
rename to librsvg/rsvg-path-builder.h
diff --git a/rsvg-private.h b/librsvg/rsvg-private.h
similarity index 100%
rename from rsvg-private.h
rename to librsvg/rsvg-private.h
diff --git a/rsvg-shapes.h b/librsvg/rsvg-shapes.h
similarity index 100%
rename from rsvg-shapes.h
rename to librsvg/rsvg-shapes.h
diff --git a/rsvg-size-callback.c b/librsvg/rsvg-size-callback.c
similarity index 100%
rename from rsvg-size-callback.c
rename to librsvg/rsvg-size-callback.c
diff --git a/rsvg-size-callback.h b/librsvg/rsvg-size-callback.h
similarity index 100%
rename from rsvg-size-callback.h
rename to librsvg/rsvg-size-callback.h
diff --git a/rsvg-structure.h b/librsvg/rsvg-structure.h
similarity index 100%
rename from rsvg-structure.h
rename to librsvg/rsvg-structure.h
diff --git a/rsvg-styles.c b/librsvg/rsvg-styles.c
similarity index 100%
rename from rsvg-styles.c
rename to librsvg/rsvg-styles.c
diff --git a/rsvg-styles.h b/librsvg/rsvg-styles.h
similarity index 100%
rename from rsvg-styles.h
rename to librsvg/rsvg-styles.h
diff --git a/rsvg-text.c b/librsvg/rsvg-text.c
similarity index 100%
rename from rsvg-text.c
rename to librsvg/rsvg-text.c
diff --git a/rsvg-text.h b/librsvg/rsvg-text.h
similarity index 100%
rename from rsvg-text.h
rename to librsvg/rsvg-text.h
diff --git a/rsvg-xml.c b/librsvg/rsvg-xml.c
similarity index 100%
rename from rsvg-xml.c
rename to librsvg/rsvg-xml.c
diff --git a/rsvg-xml.h b/librsvg/rsvg-xml.h
similarity index 100%
rename from rsvg-xml.h
rename to librsvg/rsvg-xml.h
diff --git a/rsvg.h b/librsvg/rsvg.h
similarity index 100%
rename from rsvg.h
rename to librsvg/rsvg.h
diff --git a/rsvg-convert.c b/rsvg-convert.c
index 7a5120fe..53dcadbb 100644
--- a/rsvg-convert.c
+++ b/rsvg-convert.c
@@ -51,9 +51,9 @@
 #include <gio/gwin32inputstream.h>
 #endif
 
-#include "rsvg-css.h"
-#include "rsvg.h"
-#include "rsvg-size-callback.h"
+#include "librsvg/rsvg-css.h"
+#include "librsvg/rsvg.h"
+#include "librsvg/rsvg-size-callback.h"
 
 #ifdef CAIRO_HAS_PS_SURFACE
 #include <cairo-ps.h>
diff --git a/rsvg-view.c b/rsvg-view.c
index ce581442..10f0e094 100644
--- a/rsvg-view.c
+++ b/rsvg-view.c
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "rsvg-private.h"
-#include "rsvg-size-callback.h"
+#include "librsvg/rsvg-private.h"
+#include "librsvg/rsvg-size-callback.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ddf64225..f1c23f85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,9 +33,9 @@ render_crash_SOURCES = \
        render-crash.c  \
        $(test_utils_common_sources)
 
-styles_SOURCES = \
-       styles.c        \
-       $(test_utils_common_sources)
+# styles_SOURCES = \
+#      styles.c        \
+#      $(test_utils_common_sources)
 
 dimensions_SOURCES = \
        dimensions.c    \
@@ -49,12 +49,13 @@ LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la         \
        $(LIBRSVG_LIBS)                                                 \
        $(LIBM)
 
-INCLUDES = -I$(srcdir)                                                         \
-          -I$(top_srcdir)                                              \
-          -DTEST_DATA_DIR="\"$(srcdir)\""                              \
-          -DTEST_SRC_DIR="\"$(PWD)\""                                  \
-          -DTOP_SRC_DIR="\"$(top_srcdir)\""                            \
-         $(LIBRSVG_CFLAGS)
+AM_CPPFLAGS =                                  \
+       -I$(srcdir)                             \
+       -I$(top_srcdir)/librsvg                 \
+       -DTEST_DATA_DIR="\"$(srcdir)\""         \
+       -DTEST_SRC_DIR="\"$(PWD)\""             \
+       -DTOP_SRC_DIR="\"$(top_srcdir)\""       \
+       $(LIBRSVG_CFLAGS)
 
 dist_installed_test_data =                                             \
        $(wildcard $(srcdir)/resources/*)                               \
diff --git a/tests/api.c b/tests/api.c
index 34b4fae3..018cdee8 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -7,7 +7,7 @@
 #include <glib.h>
 
 #define RSVG_DISABLE_DEPRECATION_WARNINGS /* so we can test deprecated API */
-#include "rsvg.h"
+#include "librsvg/rsvg.h"
 #include "test-utils.h"
 
 /*
diff --git a/tests/crash.c b/tests/crash.c
index e2074f9a..638b8b3a 100644
--- a/tests/crash.c
+++ b/tests/crash.c
@@ -2,7 +2,7 @@
 /* vim: set ts=4 nowrap ai expandtab sw=4: */
 
 #include <glib.h>
-#include "rsvg.h"
+#include "librsvg/rsvg.h"
 #include "test-utils.h"
 
 static void
diff --git a/tests/dimensions.c b/tests/dimensions.c
index 22c23c1d..61c197a5 100644
--- a/tests/dimensions.c
+++ b/tests/dimensions.c
@@ -2,7 +2,7 @@
 /* vim: set ts=4 nowrap ai expandtab sw=4: */
 
 #include <glib.h>
-#include "rsvg.h"
+#include "librsvg/rsvg.h"
 #include "test-utils.h"
 
 typedef struct _FixtureData
diff --git a/tests/loading.c b/tests/loading.c
index 4f6c5fb3..d856a456 100644
--- a/tests/loading.c
+++ b/tests/loading.c
@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include "rsvg.h"
+#include "librsvg/rsvg.h"
 #include "test-utils.h"
 
 typedef struct {
diff --git a/tests/render-crash.c b/tests/render-crash.c
index bb0e7219..04df7178 100644
--- a/tests/render-crash.c
+++ b/tests/render-crash.c
@@ -1,7 +1,7 @@
 /* vim: set ts=4 nowrap ai expandtab sw=4: */
 
 #include <glib.h>
-#include "rsvg.h"
+#include "librsvg/rsvg.h"
 #include "test-utils.h"
 
 static void
diff --git a/tests/rsvg-test.c b/tests/rsvg-test.c
index d58dc732..093be77d 100644
--- a/tests/rsvg-test.c
+++ b/tests/rsvg-test.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "rsvg.h"
+#include "librsvg/rsvg.h"
 
 #include "test-utils.h"
 
diff --git a/tests/styles.c b/tests/styles.c
index 67ea62ea..9c0382a3 100644
--- a/tests/styles.c
+++ b/tests/styles.c
@@ -1,11 +1,11 @@
 /* vim: set ts=4 nowrap ai expandtab sw=4: */
 
 #include <glib.h>
-#include "rsvg.h"
-#include "rsvg-private.h"
-#include "rsvg-defs.h"
-#include "rsvg-styles.h"
-#include "rsvg-paint-server.h"
+#include "librsvg/rsvg.h"
+#include "librsvg/rsvg-private.h"
+#include "librsvg/rsvg-defs.h"
+#include "librsvg/rsvg-styles.h"
+#include "librsvg/rsvg-paint-server.h"
 #include "test-utils.h"
 
 union Expected {
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d894ae3c..b3b2fc05 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES =                    \
        librsvg_tools_main.la
 endif
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        -I$(top_builddir)               \
        $(LIBRSVG_CFLAGS)               \
diff --git a/tools/rsvg-dimensions.c b/tools/rsvg-dimensions.c
index 213380fa..8b7d8325 100644
--- a/tools/rsvg-dimensions.c
+++ b/tools/rsvg-dimensions.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <rsvg.h>
+#include "librsvg/rsvg.h"
 
 static void
 show_help (GOptionContext *context)
diff --git a/tools/rsvg-tools-main.c b/tools/rsvg-tools-main.c
index af575894..d9919682 100644
--- a/tools/rsvg-tools-main.c
+++ b/tools/rsvg-tools-main.c
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "rsvg.h"
-#include "rsvg-private.h"
+#include "librsvg/rsvg.h"
+#include "librsvg/rsvg-private.h"
 #include "rsvg-tools-main.h"
 
 static gboolean
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]