cleanup: move autotools support files to subdir

10 files changed, 57 insertions, 46 deletions

diff --git a/Makefile.am b/Makefile.am
index ec69013..debfdfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = buildsystems/cmake help tests
+SUBDIRS = buildsystems/autotools buildsystems/cmake help tests
 
 bin_SCRIPTS = \
 	gtkdoc-check    \
@@ -14,8 +14,7 @@ bin_SCRIPTS = \
 	gtkdoc-mkpdf    \
 	gtkdoc-rebase   \
 	gtkdoc-scan     \
-	gtkdoc-scangobj \
-	gtkdocize
+	gtkdoc-scangobj
 
 gtkdocdatadir = $(datadir)/gtk-doc/data
 gtkdocdata_DATA = \
@@ -23,8 +22,6 @@ gtkdocdata_DATA = \
 	version-greater-or-equal.xsl \
 	devhelp2.xsd		\
 	devhelp2.xsl		\
-	gtk-doc.make		\
-	gtk-doc.flat.make	\
 	style/home.png			\
 	style/left.png			\
 	style/left-insensitive.png		\
@@ -54,18 +51,11 @@ pylibdata_DATA = \
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = gtk-doc.pc
 
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = gtk-doc.m4
-
-gtk-doc.flat.make: gtk-doc.make
-	@$(SED) -e "s/EXTRA_DIST =/EXTRA_DIST +=/" $< >$@
-
 EXTRA_DIST = \
 	MAINTAINERS     \
 	$(gtkdocdata_DATA) \
 	$(pylibdata_DATA) \
 	gtk-doc.pc.in   \
-	gtk-doc.m4      \
 	gtk-doc.doap \
 	gtk-doc-fo.xsl     \
 	doc/README            \
@@ -81,7 +71,6 @@ EXTRA_DIST = \
 	COPYING-DOCS
 
 CLEANFILES = \
-  gtk-doc.flat.make \
   gtkdoc-checkc \
   gtkdoc-depscanc \
   gtkdoc-fixxrefc \
diff --git a/README b/README
index bad0fdd..1cf00a7 100644
--- a/README
+++ b/README
@@ -92,7 +92,7 @@ ninja -C build
 
 There are some options one can specify too:
 meson build . --prefix=
-meson build . -Dautoconf_support=false
+meson build . -Dautotools_support=false
 meson build . -Dcmake_support=false
 meson build . -Dyelp_manual=false
 
diff --git a/buildsystems/autotools/Makefile.am b/buildsystems/autotools/Makefile.am
new file mode 100644
index 0000000..bb921b7
--- /dev/null
+++ b/buildsystems/autotools/Makefile.am
@@ -0,0 +1,20 @@
+EXTRA_DIST = \
+	$(autotoolsdata_DATA) \
+	gtk-doc.m4
+
+CLEANFILES = gtk-doc.flat.make
+
+bin_SCRIPTS = gtkdocize
+
+autotoolsdatadir = $(datadir)/gtk-doc/data
+autotoolsdata_DATA = \
+	gtk-doc.make		\
+	gtk-doc.flat.make
+
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = gtk-doc.m4
+
+gtk-doc.flat.make: gtk-doc.make
+	@$(SED) -e "s/EXTRA_DIST =/EXTRA_DIST +=/" $< >$@
+
+-include $(top_srcdir)/git.mk
diff --git a/gtk-doc.m4 b/buildsystems/autotools/gtk-doc.m4
index 2d12f01..2d12f01 100644
--- a/gtk-doc.m4
+++ b/buildsystems/autotools/gtk-doc.m4
diff --git a/gtk-doc.make b/buildsystems/autotools/gtk-doc.make
index 7d9a27f..7d9a27f 100644
--- a/gtk-doc.make
+++ b/buildsystems/autotools/gtk-doc.make
diff --git a/gtkdocize.in b/buildsystems/autotools/gtkdocize.in
index a688fc3..a688fc3 100755
--- a/gtkdocize.in
+++ b/buildsystems/autotools/gtkdocize.in
diff --git a/buildsystems/autotools/meson.build b/buildsystems/autotools/meson.build
new file mode 100644
index 0000000..6a8b1cc
--- /dev/null
+++ b/buildsystems/autotools/meson.build
@@ -0,0 +1,28 @@
+custom_target(
+  'gtk-doc.flat.make',
+  input: 'gtk-doc.make',
+  output: 'gtk-doc.flat.make',
+  install: true,
+  install_dir: pkgdatadir,
+  capture: true,
+  command: [
+    'sed',
+    '-e',
+    's/EXTRA_DIST =/EXTRA_DIST +=/',
+    '@INPUT@',
+  ]
+)
+
+custom_target(
+  'gtk-doc.m4',
+  input: 'gtk-doc.m4',
+  output: 'gtk-doc.m4',
+  install: true,
+  install_dir: autoconfdatadir,
+  command: [
+    'cp',
+    '-f',
+    '@INPUT@',
+    '@OUTPUT@',
+  ],
+)
diff --git a/configure.ac b/configure.ac
index 0233b72..53f2c9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,7 @@ AM_CONDITIONAL([HAVE_YELP_TOOLS],[test x$have_yelp_tools = xyes])
 # buildsystems/cmake/GtkDocConfig.cmake is handled in the Makefile, not here.
 AC_CONFIG_FILES([Makefile
 gtk-doc.pc
+buildsystems/autotools/Makefile
 buildsystems/cmake/Makefile
 buildsystems/cmake/GtkDocConfigVersion.cmake
 gtkdoc/config.py
@@ -241,7 +242,7 @@ AC_CONFIG_FILES([gtkdoc-mkpdf],    [chmod +x gtkdoc-mkpdf])
 AC_CONFIG_FILES([gtkdoc-rebase],   [chmod +x gtkdoc-rebase])
 AC_CONFIG_FILES([gtkdoc-scan],     [chmod +x gtkdoc-scan])
 AC_CONFIG_FILES([gtkdoc-scangobj], [chmod +x gtkdoc-scangobj])
-AC_CONFIG_FILES([gtkdocize],       [chmod +x gtkdocize])
+AC_CONFIG_FILES([buildsystems/autotools/gtkdocize],       [chmod +x buildsystems/autotools/gtkdocize])
 AC_CONFIG_FILES([tests/tools.sh],  [chmod +x tests/tools.sh])
 AC_OUTPUT
 
diff --git a/meson.build b/meson.build
index 8e7dbad..afa27be 100644
--- a/meson.build
+++ b/meson.build
@@ -152,37 +152,10 @@ install_data(
   install_dir: pkgdatadir,
 )
 
-custom_target(
-  'gtk-doc.flat.make',
-  input: 'gtk-doc.make',
-  output: 'gtk-doc.flat.make',
-  install: true,
-  install_dir: pkgdatadir,
-  capture: true,
-  command: [
-    'sed',
-    '-e',
-    's/EXTRA_DIST =/EXTRA_DIST +=/',
-    '@INPUT@',
-  ]
-)
-
 subdir('style')
 
-if get_option('autoconf_support') == true
-  custom_target(
-    'gtk-doc.m4',
-    input: 'gtk-doc.m4',
-    output: 'gtk-doc.m4',
-    install: true,
-    install_dir: autoconfdatadir,
-    command: [
-      'cp',
-      '-f',
-      '@INPUT@',
-      '@OUTPUT@',
-    ],
-  )
+if get_option('autotools_support') == true
+  subdir('buildsystems/autotools')
 endif
 
 if get_option('cmake_support') == true
@@ -220,7 +193,7 @@ summary = [
   '            datadir: @0@'.format(datadir),
   '',
   'Configuration:',
-  '  Autotools support: @0@'.format(get_option('autoconf_support')),
+  '  Autotools support: @0@'.format(get_option('autotools_support')),
   '      CMake support: @0@'.format(get_option('cmake_support')),
   '         PDF output: @0@'.format(generate_pdf_output),
   '        User manual: @0@'.format(get_option('yelp_manual')),
diff --git a/meson_options.txt b/meson_options.txt
index 8d24fda..ce44377 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('autoconf_support',
+option('autotools_support',
        type: 'boolean', value: true,
        description: 'Install autotools macros')
 option('cmake_support',