summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am216
-rw-r--r--configure.ac4
-rw-r--r--include/.dirstamp (renamed from librsvg/.dirstamp)0
-rw-r--r--include/rsvg-cairo.h (renamed from librsvg/rsvg-cairo.h)0
-rw-r--r--include/rsvg-css.h (renamed from librsvg/rsvg-css.h)0
-rw-r--r--include/rsvg-features.h (renamed from librsvg/rsvg-features.h)0
-rw-r--r--include/rsvg-version.h.in (renamed from librsvg/rsvg-version.h.in)0
-rw-r--r--include/rsvg.h (renamed from librsvg/rsvg.h)0
-rw-r--r--rsvg-c-srcs.mk10
-rw-r--r--rsvg-convert.c4
-rw-r--r--tests/Makefile.am52
11 files changed, 135 insertions, 151 deletions
diff --git a/Makefile.am b/Makefile.am
index 82741ce6..00bf0fad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,7 @@ _rsvg_dummy.c:
echo "static int __attribute__((unused)) __rsvg_dummy;" > _rsvg_dummy.c
# Automake wants to have a C sources list for LTLIBRARIES.
-# See LIBRSVG_INTERNALS_SRC below for the real list of Rust
-# sources.
+# See LIBRSVG_SRC below for the real list of Rust sources.
librsvg_c_api_la_SOURCES = _rsvg_dummy.c
bin_PROGRAMS = rsvg-convert
@@ -27,118 +26,101 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES = \
$(librsvg_private_headers) \
$(NULL)
-LIBRSVG_INTERNALS_SRC = \
- Cargo.toml \
- rsvg_internals/Cargo.toml \
- rsvg_internals/build.rs \
- rsvg_internals/src/angle.rs \
- rsvg_internals/src/aspect_ratio.rs \
- rsvg_internals/src/attributes.rs \
- rsvg_internals/src/bbox.rs \
- rsvg_internals/src/color.rs \
- rsvg_internals/src/cond.rs \
- rsvg_internals/src/coord_units.rs \
- rsvg_internals/src/css.rs \
- rsvg_internals/src/dasharray.rs \
- rsvg_internals/src/document.rs \
- rsvg_internals/src/dpi.rs \
- rsvg_internals/src/drawing_ctx.rs \
- rsvg_internals/src/element.rs \
- rsvg_internals/src/error.rs \
- rsvg_internals/src/filter.rs \
- rsvg_internals/src/filters/bounds.rs \
- rsvg_internals/src/filters/blend.rs \
- rsvg_internals/src/filters/color_matrix.rs \
- rsvg_internals/src/filters/component_transfer.rs \
- rsvg_internals/src/filters/composite.rs \
- rsvg_internals/src/filters/convolve_matrix.rs \
- rsvg_internals/src/filters/context.rs \
- rsvg_internals/src/filters/displacement_map.rs \
- rsvg_internals/src/filters/error.rs \
- rsvg_internals/src/filters/flood.rs \
- rsvg_internals/src/filters/gaussian_blur.rs \
- rsvg_internals/src/filters/image.rs \
- rsvg_internals/src/filters/lighting.rs \
- rsvg_internals/src/filters/merge.rs \
- rsvg_internals/src/filters/morphology.rs \
- rsvg_internals/src/filters/mod.rs \
- rsvg_internals/src/filters/offset.rs \
- rsvg_internals/src/filters/tile.rs \
- rsvg_internals/src/filters/turbulence.rs \
- rsvg_internals/src/float_eq_cairo.rs \
- rsvg_internals/src/font_props.rs \
- rsvg_internals/src/gradient.rs \
- rsvg_internals/src/handle.rs \
- rsvg_internals/src/href.rs \
- rsvg_internals/src/image.rs \
- rsvg_internals/src/io.rs \
- rsvg_internals/src/iri.rs \
- rsvg_internals/src/length.rs \
- rsvg_internals/src/lib.rs \
- rsvg_internals/src/limits.rs \
- rsvg_internals/src/log.rs \
- rsvg_internals/src/marker.rs \
- rsvg_internals/src/node.rs \
- rsvg_internals/src/number_list.rs \
- rsvg_internals/src/paint_server.rs \
- rsvg_internals/src/parsers.rs \
- rsvg_internals/src/path_builder.rs \
- rsvg_internals/src/path_parser.rs \
- rsvg_internals/src/pattern.rs \
- rsvg_internals/src/properties.rs \
- rsvg_internals/src/property_defs.rs \
- rsvg_internals/src/property_macros.rs \
- rsvg_internals/src/rect.rs \
- rsvg_internals/src/shapes.rs \
- rsvg_internals/src/surface_utils/compare_surfaces.rs \
- rsvg_internals/src/surface_utils/iterators.rs \
- rsvg_internals/src/surface_utils/mod.rs \
- rsvg_internals/src/surface_utils/shared_surface.rs \
- rsvg_internals/src/surface_utils/srgb.rs \
- rsvg_internals/src/space.rs \
- rsvg_internals/src/structure.rs \
- rsvg_internals/src/style.rs \
- rsvg_internals/src/test_utils.rs \
- rsvg_internals/src/text.rs \
- rsvg_internals/src/transform.rs \
- rsvg_internals/src/unit_interval.rs \
- rsvg_internals/src/url_resolver.rs \
- rsvg_internals/src/util.rs \
- rsvg_internals/src/viewbox.rs \
- rsvg_internals/src/xml.rs \
- rsvg_internals/src/xml2.rs \
- rsvg_internals/src/xml2_load.rs \
- $(NULL)
-
-LIBRSVG_CRATE_SRC = \
- librsvg_crate/Cargo.toml \
- librsvg_crate/example.svg \
- librsvg_crate/examples/proportional.rs \
- librsvg_crate/src/lib.rs \
- librsvg_crate/tests/standalone/api.rs \
- librsvg_crate/tests/standalone/bugs.rs \
- librsvg_crate/tests/standalone/intrinsic_dimensions.rs \
- librsvg_crate/tests/standalone/main.rs \
- librsvg_crate/tests/standalone/primitives.rs \
- librsvg_crate/tests/standalone/utils.rs \
- $(NULL)
-
-LIBRSVG_C_API_SRC = \
- librsvg/Cargo.toml \
- librsvg/build.rs \
- librsvg/c_api.rs \
- librsvg/color_utils.rs \
- librsvg/dpi.rs \
- librsvg/lib.rs \
- librsvg/messages.rs \
- librsvg/pixbuf_utils.rs \
- librsvg/sizing.rs \
- librsvg/benches/pixbuf_from_surface.rs \
+LIBRSVG_SRC = \
+ Cargo.toml \
+ build.rs \
+ src/angle.rs \
+ src/api.rs \
+ src/aspect_ratio.rs \
+ src/attributes.rs \
+ src/bbox.rs \
+ src/c_api/color_utils.rs \
+ src/c_api/dpi.rs \
+ src/c_api/handle.rs \
+ src/c_api/messages.rs \
+ src/c_api/mod.rs \
+ src/c_api/pixbuf_utils.rs \
+ src/c_api/sizing.rs \
+ src/color.rs \
+ src/cond.rs \
+ src/coord_units.rs \
+ src/css.rs \
+ src/dasharray.rs \
+ src/document.rs \
+ src/dpi.rs \
+ src/drawing_ctx.rs \
+ src/element.rs \
+ src/error.rs \
+ src/filter.rs \
+ src/filters/blend.rs \
+ src/filters/bounds.rs \
+ src/filters/color_matrix.rs \
+ src/filters/component_transfer.rs \
+ src/filters/composite.rs \
+ src/filters/context.rs \
+ src/filters/convolve_matrix.rs \
+ src/filters/displacement_map.rs \
+ src/filters/error.rs \
+ src/filters/flood.rs \
+ src/filters/gaussian_blur.rs \
+ src/filters/image.rs \
+ src/filters/lighting.rs \
+ src/filters/merge.rs \
+ src/filters/mod.rs \
+ src/filters/morphology.rs \
+ src/filters/offset.rs \
+ src/filters/tile.rs \
+ src/filters/turbulence.rs \
+ src/float_eq_cairo.rs \
+ src/font_props.rs \
+ src/gradient.rs \
+ src/handle.rs \
+ src/href.rs \
+ src/image.rs \
+ src/io.rs \
+ src/iri.rs \
+ src/length.rs \
+ src/lib.rs \
+ src/limits.rs \
+ src/log.rs \
+ src/marker.rs \
+ src/node.rs \
+ src/number_list.rs \
+ src/paint_server.rs \
+ src/parsers.rs \
+ src/path_builder.rs \
+ src/path_parser.rs \
+ src/pattern.rs \
+ src/properties.rs \
+ src/property_defs.rs \
+ src/property_macros.rs \
+ src/rect.rs \
+ src/shapes.rs \
+ src/space.rs \
+ src/structure.rs \
+ src/style.rs \
+ src/surface_utils/compare_surfaces.rs \
+ src/surface_utils/iterators.rs \
+ src/surface_utils/mod.rs \
+ src/surface_utils/shared_surface.rs \
+ src/surface_utils/srgb.rs \
+ src/test_utils.rs \
+ src/text.rs \
+ src/transform.rs \
+ src/ua.css \
+ src/unit_interval.rs \
+ src/url_resolver.rs \
+ src/util.rs \
+ src/viewbox.rs \
+ src/xml2_load.rs \
+ src/xml2.rs \
+ src/xml.rs \
$(NULL)
RUST_EXTRA = \
Cargo.lock \
cargo-vendor-config \
+ example.svg \
rsvg_internals/benches/box_blur.rs \
rsvg_internals/benches/composite.rs \
rsvg_internals/benches/lighting.rs \
@@ -201,8 +183,8 @@ dist-hook:
mkdir .cargo && \
cp cargo-vendor-config .cargo/config)
-librsvg_c_api.la: $(librsvg_c_api_la_OBJECTS) $(LIBRSVG_INTERNALS_SRC) $(LIBRSVG_C_API_SRC)
- +cd $(top_srcdir)/librsvg && \
+librsvg_c_api.la: $(librsvg_c_api_la_OBJECTS) $(LIBRSVG_SRC)
+ +cd $(top_srcdir) && \
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
@@ -212,7 +194,7 @@ librsvg_c_api.la: $(librsvg_c_api_la_OBJECTS) $(LIBRSVG_INTERNALS_SRC) $(LIBRSVG
librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
- -I$(top_builddir)/librsvg \
+ -I$(top_builddir)/include \
-DG_LOG_DOMAIN=\"librsvg\" \
-DLIBRSVG_DATADIR="\"$(datadir)\"" \
-DSRCDIR=\""${abs_top_srcdir}"\" \
@@ -250,7 +232,7 @@ rsvg_convert_SOURCES = \
rsvg_convert_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
- -I$(top_builddir)/librsvg \
+ -I$(top_builddir)/include \
-DLIBRSVG_DATADIR="\"$(datadir)\"" \
$(AM_CPPFLAGS)
@@ -272,10 +254,8 @@ dist_doc_DATA = \
code-of-conduct.md
EXTRA_DIST = \
- $(LIBRSVG_INTERNALS_SRC) \
- $(LIBRSVG_C_API_SRC) \
+ $(LIBRSVG_SRC) \
$(RUST_EXTRA) \
- $(LIBRSVG_CRATE_SRC) \
librsvg.doap \
AUTHORS \
NEWS \
@@ -319,9 +299,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)/librsvg -DRSVG_COMPILATION
+Rsvg_@RSVG_API_VERSION_U@_gir_CFLAGS = -I$(top_builddir) -I$(top_builddir)/include -DRSVG_COMPILATION
Rsvg_@RSVG_API_VERSION_U@_gir_LIBS = librsvg-@RSVG_API_MAJOR_VERSION@.la
-Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS = --c-include="librsvg/rsvg.h"
+Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS = --c-include="include/rsvg.h"
girdir = $(datadir)/gir-1.0
nodist_gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/configure.ac b/configure.ac
index 94698702..b29860ff 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([librsvg/rsvg.h])
+AC_CONFIG_SRCDIR([include/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([
-librsvg/rsvg-version.h
+include/rsvg-version.h
Makefile
librsvg-zip
gdk-pixbuf-loader/Makefile
diff --git a/librsvg/.dirstamp b/include/.dirstamp
index e69de29b..e69de29b 100644
--- a/librsvg/.dirstamp
+++ b/include/.dirstamp
diff --git a/librsvg/rsvg-cairo.h b/include/rsvg-cairo.h
index 87821057..87821057 100644
--- a/librsvg/rsvg-cairo.h
+++ b/include/rsvg-cairo.h
diff --git a/librsvg/rsvg-css.h b/include/rsvg-css.h
index dfca15b0..dfca15b0 100644
--- a/librsvg/rsvg-css.h
+++ b/include/rsvg-css.h
diff --git a/librsvg/rsvg-features.h b/include/rsvg-features.h
index 906c3a0e..906c3a0e 100644
--- a/librsvg/rsvg-features.h
+++ b/include/rsvg-features.h
diff --git a/librsvg/rsvg-version.h.in b/include/rsvg-version.h.in
index 5fe431a9..5fe431a9 100644
--- a/librsvg/rsvg-version.h.in
+++ b/include/rsvg-version.h.in
diff --git a/librsvg/rsvg.h b/include/rsvg.h
index 11b02931..11b02931 100644
--- a/librsvg/rsvg.h
+++ b/include/rsvg.h
diff --git a/rsvg-c-srcs.mk b/rsvg-c-srcs.mk
index ffc07b7c..917fcc86 100644
--- a/rsvg-c-srcs.mk
+++ b/rsvg-c-srcs.mk
@@ -1,12 +1,12 @@
librsvg_public_headers = \
- librsvg/rsvg.h \
- librsvg/rsvg-cairo.h \
- librsvg/rsvg-features.h \
- librsvg/rsvg-version.h \
+ include/rsvg.h \
+ include/rsvg-cairo.h \
+ include/rsvg-features.h \
+ include/rsvg-version.h \
$(NULL)
librsvg_private_headers = \
- librsvg/rsvg-css.h \
+ include/rsvg-css.h \
$(NULL)
rsvg_convert_srcs = rsvg-convert.c
diff --git a/rsvg-convert.c b/rsvg-convert.c
index cb17345d..53d60732 100644
--- a/rsvg-convert.c
+++ b/rsvg-convert.c
@@ -56,8 +56,8 @@
#include <gio/gwin32inputstream.h>
#endif
-#include "librsvg/rsvg-css.h"
-#include "librsvg/rsvg.h"
+#include "include/rsvg-css.h"
+#include "include/rsvg.h"
#ifdef CAIRO_HAS_PS_SURFACE
#include <cairo-ps.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6108bd7f..dea73eec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,35 +1,39 @@
include $(top_srcdir)/glib-tap.mk
-test_sources = \
- Cargo.toml \
- build.rs \
- src/errors.rs \
- src/loading_crash.rs \
- src/main.rs \
- src/reference.rs \
- src/render_crash.rs \
- src/utils.rs \
- src/cmdline/mod.rs \
- src/cmdline/rsvg_convert.rs \
- src/predicates/file.rs \
- src/predicates/mod.rs \
- src/predicates/pdf.rs \
- src/predicates/png.rs
+NULL =
+
+test_sources = \
+ build.rs \
+ src/api.rs \
+ src/bugs.rs \
+ src/cmdline/mod.rs \
+ src/cmdline/rsvg_convert.rs \
+ src/errors.rs \
+ src/intrinsic_dimensions.rs \
+ src/loading_crash.rs \
+ src/main.rs \
+ src/predicates/file.rs \
+ src/predicates/mod.rs \
+ src/predicates/pdf.rs \
+ src/predicates/png.rs \
+ src/primitives.rs \
+ src/reference.rs \
+ src/render_crash.rs \
+ src/utils.rs \
+ $(NULL)
EXTRA_DIST += \
$(test_sources) \
- README.md
-
-test_programs = \
- api
+ README.md \
+ $(NULL)
-test_utils_common_sources = \
- test-utils.c \
- test-utils.h
+test_programs = api
api_SOURCES = \
api.c \
- $(test_utils_common_sources)
+ test-utils.c \
+ test-utils.h \
+ $(NULL)
LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
$(LIBRSVG_LIBS) \
@@ -38,7 +42,7 @@ LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
AM_CPPFLAGS = \
-I$(srcdir) \
-I$(top_srcdir) \
- -I$(top_builddir)/librsvg \
+ -I$(top_builddir)/include \
-DTEST_DATA_DIR="\"$(srcdir)\"" \
-DTEST_SRC_DIR="\"$(PWD)\"" \
-DTOP_SRC_DIR="\"$(top_srcdir)\"" \
View Lorry Controller Status