Remove AUTHORS and MAINTAINERS and add info to README.md

5 files changed, 34 insertions, 27 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 2c4d006..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,10 +0,0 @@
-Please do not email us directly - use the mailing list.
-See http://cairographics.org/lists
-
-Maintainers:
-----------
-Murray Cumming
-Jonathon Jongsma
-
-Based on code from Leonard Ritter.
-
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 54d06c9..0000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,8 +0,0 @@
-Please use the mailing list (cairo@cairographics.org) rather than emailing
-developers directly.
-
-Murray Cumming
-Email: murrayc@murrayc.com
-
-Jonathon Jongsma
-Email: jonathon.jongsma@gmail.com
diff --git a/Makefile.am b/Makefile.am
index 63bf2f1..2db7707 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ include $(srcdir)/MSVC_NMake/filelist.am
 
 msvc_files = $(addprefix MSVC_NMake/,$(msvc_nmake_data))
 
-dist_noinst_DATA = MAINTAINERS $(msvc_files)
+dist_noinst_DATA = README.md $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh
 
 DISTCLEANFILES = MSVC_NMake/cairomm/cairommconfig.h
diff --git a/README.md b/README.md
index 5bb6874..264fd64 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,36 @@
 # cairomm
 This library provides a C++ interface to cairo.
-See https://www.cairographics.org/cairomm/
+
+# General information
+
+Web site
+ - https://www.cairographics.org/cairomm/
+
+Download location
+ - https://www.cairographics.org/releases/
+
+Reference documentation
+ - https://www.cairographics.org/documentation/cairomm/reference/
+
+Tarballs contain reference documentation. In tarballs generated with Meson,
+see the untracked/docs/reference/html directory.
+
+Mailing list
+ - https://lists.cairographics.org/cgi-bin/mailman/listinfo/cairo
+
+Git repository
+ - https://gitlab.freedesktop.org/cairo/cairomm
+
+Bugs can be reported to
+ - https://gitlab.freedesktop.org/cairo/cairomm/-/issues
+
+Patches can be submitted to
+ - https://gitlab.freedesktop.org/cairo/cairomm/-/merge_requests
+
+# Building
+
+Whenever possible, you should use the official binary packages approved by the
+supplier of your operating system, such as your Linux distribution.
 
 See the examples directory for example code.
 
@@ -11,14 +41,9 @@ Use pkg-config to discover the necessary include and linker arguments. For insta
 If you build with Autotools, ideally you would use PKG_CHECK_MODULES in your
 configure.ac file.
 
-# Building
-
-Whenever possible, you should use the official binary packages approved by the
-supplier of your operating system, such as your Linux distribution.
-
 ## Building on Windows
 
-See MSVC_NMake/MSVC-Builds.md
+See [MSVC-Builds.md](MSVC_NMake/MSVC-Builds.md)
 
 ## Building from a release tarball
 
diff --git a/configure.ac b/configure.ac
index f3039b0..5c86219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_HEADERS([build/config.h cairommconfig.h])
 
-AM_INIT_AUTOMAKE([1.10 -Wno-portability no-dist-gzip dist-xz no-define nostdinc tar-pax])
+AM_INIT_AUTOMAKE([1.10 -Wno-portability no-dist-gzip dist-xz no-define nostdinc tar-pax foreign])
 # Support silent build rules.
 # Disable by either passing --disable-silent-rules to configure or passing V=1 to make.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])