[gtk-doc] cleanup: move 'cmake' to a subdir buildsystems



commit 47a1102a511b184f01ce99bf300d93f135f6315d
Author: Stefan Sauer <ensonic users sf net>
Date:   Sun May 20 22:43:47 2018 +0200

    cleanup: move 'cmake' to a subdir buildsystems
    
    This is a preparation to also move the autotools support next.

 Makefile.am                                        |    2 +-
 .../cmake}/GtkDocConfig.cmake.in                   |    0
 .../cmake}/GtkDocConfigVersion.cmake.in            |    0
 .../cmake}/GtkDocScanGObjWrapper.cmake             |    0
 {cmake => buildsystems/cmake}/Makefile.am          |    0
 {cmake => buildsystems/cmake}/meson.build          |    0
 configure.ac                                       |    6 +++---
 meson.build                                        |    2 +-
 8 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e23ed41..ec69013 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 = cmake help tests
+SUBDIRS = buildsystems/cmake help tests
 
 bin_SCRIPTS = \
        gtkdoc-check    \
diff --git a/cmake/GtkDocConfig.cmake.in b/buildsystems/cmake/GtkDocConfig.cmake.in
similarity index 100%
rename from cmake/GtkDocConfig.cmake.in
rename to buildsystems/cmake/GtkDocConfig.cmake.in
diff --git a/cmake/GtkDocConfigVersion.cmake.in b/buildsystems/cmake/GtkDocConfigVersion.cmake.in
similarity index 100%
rename from cmake/GtkDocConfigVersion.cmake.in
rename to buildsystems/cmake/GtkDocConfigVersion.cmake.in
diff --git a/cmake/GtkDocScanGObjWrapper.cmake b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake
similarity index 100%
rename from cmake/GtkDocScanGObjWrapper.cmake
rename to buildsystems/cmake/GtkDocScanGObjWrapper.cmake
diff --git a/cmake/Makefile.am b/buildsystems/cmake/Makefile.am
similarity index 100%
rename from cmake/Makefile.am
rename to buildsystems/cmake/Makefile.am
diff --git a/cmake/meson.build b/buildsystems/cmake/meson.build
similarity index 100%
rename from cmake/meson.build
rename to buildsystems/cmake/meson.build
diff --git a/configure.ac b/configure.ac
index a14f403..0233b72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,11 +210,11 @@ if test "x$have_yelp_tools" != "xyes"; then
 fi
 AM_CONDITIONAL([HAVE_YELP_TOOLS],[test x$have_yelp_tools = xyes])
 
-# cmake/GtkDocConfig.cmake is handled in the Makefile, not here.
+# buildsystems/cmake/GtkDocConfig.cmake is handled in the Makefile, not here.
 AC_CONFIG_FILES([Makefile
 gtk-doc.pc
-cmake/Makefile
-cmake/GtkDocConfigVersion.cmake
+buildsystems/cmake/Makefile
+buildsystems/cmake/GtkDocConfigVersion.cmake
 gtkdoc/config.py
 help/Makefile
 help/manual/Makefile
diff --git a/meson.build b/meson.build
index 6ffcd58..8e7dbad 100644
--- a/meson.build
+++ b/meson.build
@@ -186,7 +186,7 @@ if get_option('autoconf_support') == true
 endif
 
 if get_option('cmake_support') == true
-  subdir('cmake')
+  subdir('buildsystems/cmake')
 endif
 
 gtkdoc_pc = configuration_data()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]