build: distcheck fixes, including one generic srcdir!=builddir fix

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f21e710..add7be8 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -32,13 +32,16 @@ CFILE_GLOB=
 IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
        soup-message-private.h soup-session-private.h \
        soup-auth-basic.h soup-auth-digest.h soup-auth-ntlm.h \
-       soup-connection.h soup-connection-ntlm.h \
-       soup-dns.h soup-auth-manager.h soup-auth-manager-ntlm.h \
-       soup-message-queue.h soup-path-map.h soup-ssl.h \
+       soup-connection.h soup-auth-manager.h soup-auth-manager-ntlm.h \
+       soup-message-queue.h soup-path-map.h \
        soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
        soup-proxy-resolver-static.h soup-directory-input-stream.h \
        soup-http-input-stream.h soup-password-manager.h \
-       soup-password-manager-gnome.h
+       soup-password-manager-gnome.h soup-converter-wrapper.h \
+       soup-body-input-stream.h soup-body-output-stream.h \
+       soup-client-input-stream.h soup-content-processor.h \
+       soup-content-sniffer-stream.h soup-io-stream.h \
+       soup-filter-input-stream.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES = 

diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 98f0b4b..31267a3 100644 (file)
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES =                            \
        -DG_LOG_DOMAIN=\"libsoup\"      \
        -DLOCALEDIR=\"$(localedir)\"    \
        -I$(top_srcdir)                 \
+       -I$(top_builddir)               \
        $(SOUP_DEBUG_FLAGS)             \
        $(SOUP_MAINTAINER_FLAGS)        \
        $(GLIB_CFLAGS)                  \
@@ -82,6 +83,8 @@ libsoup_2_4_la_LDFLAGS =      \
        -no-undefined \
        -export-symbols $(srcdir)/libsoup-2.4.sym
 
+EXTRA_DIST += libsoup-2.4.sym
+
 libsoup_2_4_la_LIBADD =                        \
        $(GLIB_LIBS)                    \
        $(XML_LIBS)                     \
@@ -213,6 +216,8 @@ libsoup_gnome_2_4_la_LDFLAGS =      \
        -no-undefined \
        -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
 
+EXTRA_DIST += libsoup-gnome-2.4.sym
+
 libsoup_gnome_2_4_la_LIBADD =          \
        libsoup-2.4.la                  \
        $(GLIB_LIBS)                    \