[librsvg: 2/3] Revert some more changes to the build system

[Federico Mena Quintero <federico src gnome org>]

commit deb98df08ad0a5b760f6d40f3c52f72a98d45b4c
Author: Sven Neumann <sven svenfoo org>
Date:   Tue Sep 29 13:32:17 2020 +0200

    Revert some more changes to the build system
    
    These are part of commit b8c8756a0e8148afb2752acb62f06c57c917e4b4
    and need to be revisited more carefully as they affect the GObject
    introspection and Vala bindings.

 Makefile.am    |  7 -------
 rsvg-c-srcs.mk | 16 +++++++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fc1ff0f7..cdc509d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,12 +132,6 @@ LIBRSVG_C_API_SRC =                                                \
        librsvg/benches/pixbuf_from_surface.rs                  \
        $(NULL)
 
-LIBRSVG_C_API_DOC_SRC =                                                \
-       librsvg/rsvg-base.c                                     \
-       librsvg/rsvg-features.c                                 \
-       librsvg/rsvg-handle.c                                   \
-       librsvg/rsvg-pixbuf.c
-
 RUST_EXTRA =                                           \
        Cargo.lock                                      \
        cargo-vendor-config                             \
@@ -276,7 +270,6 @@ dist_doc_DATA =                             \
 EXTRA_DIST =                           \
        $(LIBRSVG_INTERNALS_SRC)        \
        $(LIBRSVG_C_API_SRC)            \
-       $(LIBRSVG_C_API_DOC_SRC)        \
        $(RUST_EXTRA)                   \
        $(LIBRSVG_CRATE_SRC)            \
        librsvg.doap                    \
diff --git a/rsvg-c-srcs.mk b/rsvg-c-srcs.mk
index d6290da7..2b283e55 100644
--- a/rsvg-c-srcs.mk
+++ b/rsvg-c-srcs.mk
@@ -3,15 +3,17 @@ headers =                     \
        librsvg/rsvg-cairo.h    \
        librsvg/rsvg-features.h
 
-extra_inc_headers =            \
+extra_inc_headers =    \
        librsvg/rsvg-version.h
 
-librsvg_c_srcs =               \
-       librsvg/rsvg-cairo.h    \
-       librsvg/rsvg-css.h      \
-       librsvg/rsvg-features.h \
-       librsvg/rsvg-version.h  \
-       librsvg/rsvg.h          \
+librsvg_c_srcs =       \
+       librsvg/rsvg-base.c             \
+       librsvg/rsvg-cairo.h            \
+       librsvg/rsvg-css.h              \
+       librsvg/rsvg-features.h         \
+       librsvg/rsvg-handle.c           \
+       librsvg/rsvg-pixbuf.c           \
+       librsvg/rsvg.h                  \
        $(NULL)
 
 rsvg_convert_srcs = rsvg-convert.c