Bump to libsigc++ 2.10.7

[platform/upstream/libsigc++.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1e4fc38..9a6f4a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,11 @@
 ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
 
 if ENABLE_DOCUMENTATION
-doc_subdirs = docs/docs
+doc_subdirs = docs
 else
 doc_subdirs =
 endif
-SUBDIRS = sigc++ tests examples cmake $(doc_subdirs)
+SUBDIRS = sigc++ tests examples $(doc_subdirs)
 
 sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include
 nodist_sigc_config_HEADERS = sigc++config.h
@@ -35,14 +35,29 @@ dist_noinst_SCRIPTS = autogen.sh
 
 include $(srcdir)/MSVC_NMake/filelist.am
 
-dist_noinst_DATA = \
-  $(addprefix MSVC_NMake/,$(msvc_nmake_data)) \
-  CMakeLists.txt \
-  sigc++config.h.cmake \
-  cmake_uninstall.cmake.in \
-  README.md
+dist_noinst_DATA = $(addprefix MSVC_NMake/,$(msvc_nmake_data))
 
 DISTCLEANFILES = MSVC_NMake/sigc++config.h
 
+# Distribute files needed when building libsigc++ with meson.
+EXTRA_DIST = \
+  meson.build \
+  meson_options.txt \
+  sigc++config.h.meson \
+  MSVC_NMake/meson.build \
+  docs/manual/meson.build \
+  docs/reference/meson.build \
+  examples/meson.build \
+  sigc++/meson.build \
+  subprojects/mm-common.wrap \
+  tests/meson.build \
+  tools/handle-built-files.py \
+  tools/tutorial-custom-cmd.py \
+  tools/gcc_template_specialization_operator_overload.cc \
+  tools/have_sun_reverse_iterator.cc \
+  tools/msvc_template_specialization_operator_overload.cc \
+  tools/pragma_push_pop_macro.cc \
+  untracked/README
+
 # Optional: auto-generate the ChangeLog file from the git log on make dist
 include $(top_srcdir)/build/dist-changelog.am