Revert "Merge pull request #1194 from ascent12/meson_feature"

This breaks wlroots when used as a meson subproject.

This reverts commit dea311992eb4ff3e343c3cf5b0603034223d2a42, reversing
changes made to 6db9c4b74667c1d917d720f5e96985a2461569fb.

9 files changed, 4 insertions, 135 deletions

diff --git a/include/wlr/backend/meson.build b/include/wlr/backend/meson.build
deleted file mode 100644
index e005b854..00000000
--- a/include/wlr/backend/meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
-install_headers(
-	'drm.h',
-	'headless.h',
-	'interface.h',
-	'libinput.h',
-	'multi.h',
-	'session.h',
-	'wayland.h',
-	subdir: 'wlr/backend',
-)
-
-if conf_data.get('WLR_HAS_X11_BACKEND', false)
-	install_headers('x11.h', subdir: 'wlr/backend')
-endif
-
-subdir('session')
diff --git a/include/wlr/backend/session/meson.build b/include/wlr/backend/session/meson.build
deleted file mode 100644
index 21b5a96b..00000000
--- a/include/wlr/backend/session/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-install_headers('interface.h', subdir: 'wlr/backend/session')
diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in
deleted file mode 100644
index 750ad3b7..00000000
--- a/include/wlr/config.h.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef WLR_CONFIG_H
-#define WLR_CONFIG_H
-
-#mesondefine WLR_HAS_LIBCAP
-
-#mesondefine WLR_HAS_SYSTEMD
-#mesondefine WLR_HAS_ELOGIND
-
-#mesondefine WLR_HAS_X11_BACKEND
-
-#mesondefine WLR_HAS_XWAYLAND
-
-#mesondefine WLR_HAS_XCB_ERRORS
-#mesondefine WLR_HAS_XCB_ICCCM
-#mesondefine WLR_HAS_XCB_XKB
-
-#mesondefine WLR_HAS_POSIX_FALLOCATE
-
-#endif
diff --git a/include/wlr/interfaces/meson.build b/include/wlr/interfaces/meson.build
deleted file mode 100644
index 207896b5..00000000
--- a/include/wlr/interfaces/meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
-install_headers(
-	'wlr_input_device.h',
-	'wlr_keyboard.h',
-	'wlr_output.h',
-	'wlr_pointer.h',
-	'wlr_tablet_pad.h',
-	'wlr_tablet_tool.h',
-	'wlr_touch.h',
-	subdir: 'wlr/interfaces',
-)
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
index 43b5aec9..6259c311 100644
--- a/include/wlr/meson.build
+++ b/include/wlr/meson.build
@@ -4,23 +4,11 @@ version_data.set_quoted('WLR_VERSION_STR',   meson.project_version())
 version_data.set('WLR_VERSION_MAJOR',        version_array[0])
 version_data.set('WLR_VERSION_MINOR',        version_array[1])
 version_data.set('WLR_VERSION_MICRO',        version_array[2])
+version_data.set('WLR_VERSION_NUM',          '(WLR_VERSION_MAJOR << 16) | (WLR_VERSION_MINOR << 8) | WLR_VERSION_MICRO')
 version_data.set('WLR_VERSION_API_CURRENT',  so_version[0])
 version_data.set('WLR_VERSION_API_REVISION', so_version[1])
 version_data.set('WLR_VERSION_API_AGE',      so_version[2])
 
-install_headers(
-	configure_file(input: 'config.h.in', output: 'config.h',configuration: conf_data),
-	configure_file(input: 'version.h.in', output: 'version.h', configuration: version_data),
-	'backend.h',
-	'xcursor.h',
-	subdir: 'wlr'
-)
-if conf_data.get('WLR_HAS_XWAYLAND', false)
-	install_headers('xwayland.h', subdir: 'wlr')
-endif
-
-subdir('backend')
-subdir('interfaces')
-subdir('render')
-subdir('types')
-subdir('util')
+wlr_inc_dest = join_paths(get_option('includedir'), 'wlr')
+configure_file(output: 'config.h',  install_dir: wlr_inc_dest, configuration: conf_data)
+configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data)
diff --git a/include/wlr/render/meson.build b/include/wlr/render/meson.build
deleted file mode 100644
index 05127bb7..00000000
--- a/include/wlr/render/meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
-install_headers(
-	'dmabuf.h',
-	'egl.h',
-	'gles2.h',
-	'interface.h',
-	'wlr_renderer.h',
-	'wlr_texture.h',
-	subdir: 'wlr/render'
-)
diff --git a/include/wlr/types/meson.build b/include/wlr/types/meson.build
deleted file mode 100644
index 8c81cb0e..00000000
--- a/include/wlr/types/meson.build
+++ /dev/null
@@ -1,42 +0,0 @@
-install_headers(
-	'wlr_box.h',
-	'wlr_buffer.h',
-	'wlr_compositor.h',
-	'wlr_cursor.h',
-	'wlr_data_device.h',
-	'wlr_export_dmabuf_v1.h',
-	'wlr_gamma_control.h',
-	'wlr_gamma_control_v1.h',
-	'wlr_idle.h',
-	'wlr_idle_inhibit_v1.h',
-	'wlr_input_device.h',
-	'wlr_input_inhibitor.h',
-	'wlr_keyboard.h',
-	'wlr_layer_shell.h',
-	'wlr_linux_dmabuf_v1.h',
-	'wlr_list.h',
-	'wlr_matrix.h',
-	'wlr_output.h',
-	'wlr_output_damage.h',
-	'wlr_output_layout.h',
-	'wlr_pointer.h',
-	'wlr_primary_selection.h',
-	'wlr_region.h',
-	'wlr_screencopy_v1.h',
-	'wlr_screenshooter.h',
-	'wlr_seat.h',
-	'wlr_server_decoration.h',
-	'wlr_surface.h',
-	'wlr_tablet_pad.h',
-	'wlr_tablet_tool.h',
-	'wlr_tablet_v2.h',
-	'wlr_touch.h',
-	'wlr_virtual_keyboard_v1.h',
-	'wlr_wl_shell.h',
-	'wlr_xcursor_manager.h',
-	'wlr_xdg_decoration_v1.h',
-	'wlr_xdg_output.h',
-	'wlr_xdg_shell.h',
-	'wlr_xdg_shell_v6.h',
-	subdir: 'wlr/types',
-)
diff --git a/include/wlr/util/meson.build b/include/wlr/util/meson.build
deleted file mode 100644
index ee72cbd6..00000000
--- a/include/wlr/util/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-install_headers(
-	'edges.h',
-	'log.h',
-	'region.h',
-	subdir: 'wlr/util',
-)
diff --git a/include/wlr/version.h.in b/include/wlr/version.h.in
deleted file mode 100644
index cdc0fd75..00000000
--- a/include/wlr/version.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef WLR_VERSION_H
-#define WLR_VERSION_H
-
-#mesondefine WLR_VERSION_STR
-
-#mesondefine WLR_VERSION_MAJOR
-#mesondefine WLR_VERSION_MINOR
-#mesondefine WLR_VERSION_MICRO
-
-#define WLR_VERSION_NUM ((WLR_VERSION_MAJOR << 16) | (WLR_VERSION_MINOR << 8) | WLR_VERSION_MICRO)
-
-#mesondefine WLR_VERSION_API_CURRENT
-#mesondefine WLR_VERSION_API_REVISION
-#mesondefine WLR_VERSION_API_AGE
-
-#endif