From 87d4aed3adb15c5db108927ca5d95e7b3063db40 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 17 Jul 2019 11:40:40 +1000
Subject: [PATCH] Drop the cpp requirement and linker tests

This is a leftover from libratbag-as-a-library and obsolete now that ratbagd
is our only product. Our buildtest now is simply: "does ratbagd build?" and we
certainly shouldn't require a C++ compiler.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 meson.build           | 34 +++++-----------------------------
 test/build-cxx.cc     | 11 -----------
 test/build-pedantic.c |  9 ---------
 3 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 test/build-cxx.cc
 delete mode 100644 test/build-pedantic.c

diff --git a/meson.build b/meson.build
index 5fe1fba6..34804919 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('libratbag', 'c', 'cpp',
+project('libratbag', 'c',
 	version : '0.9.905',
 	license : 'MIT/Expat',
 	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
@@ -28,11 +28,11 @@ liblur_so_version = '@0@.@1@.@2@'.format((liblur_so_c-liblur_so_a),
 
 # Compiler setup
 cc = meson.get_compiler('c')
-cpp = meson.get_compiler('cpp')
-cppflags = ['-Wno-unused-parameter', '-fvisibility=hidden']
-cflags = cppflags + ['-Wmissing-prototypes', '-Wstrict-prototypes']
+cflags = ['-Wno-unused-parameter',
+	  '-fvisibility=hidden',
+	  '-Wmissing-prototypes',
+	  '-Wstrict-prototypes']
 add_project_arguments(cflags, language: 'c')
-add_project_arguments(cppflags, language: 'cpp')
 
 # Initialize config.h, to be added to in the various options below, config.h
 # is generated at the end of this file
@@ -371,30 +371,6 @@ if enable_tests
 			       '--error-exitcode=3',
 			       '--suppressions=' + valgrind_suppressions_file ],
 		       timeout_multiplier: 5)
-
-	executable('test-build-cxx',
-		   ['test/build-cxx.cc'],
-		   dependencies : [ dep_libratbag ],
-		   include_directories : include_directories('src'),
-		   cpp_args : ['-Wall', '-Wextra', '-Wno-unused-parameter'],
-		   install : false)
-	executable('test-build-linker',
-		   ['test/build-pedantic.c'],
-		   dependencies : [ dep_libratbag ],
-		   include_directories : include_directories('src'),
-		   install : false)
-	executable('test-build-gnuc90',
-		   ['test/build-pedantic.c'],
-		   dependencies : [ dep_libratbag ],
-		   include_directories : include_directories('src'),
-		   c_args : ['-std=gnu90', '-Werror'],
-		   install : false)
-	executable('test-build-pedantic',
-		   ['test/build-pedantic.c'],
-		   dependencies : [ dep_libratbag ],
-		   include_directories : include_directories('src'),
-		   c_args : ['-std=c99', '-pedantic', '-Werror'],
-		   install : false)
 endif
 
 #### ratbagd ####
diff --git a/test/build-cxx.cc b/test/build-cxx.cc
deleted file mode 100644
index 6b0799e3..00000000
--- a/test/build-cxx.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <libratbag.h>
-
-/* This is a build-test only */
-
-using namespace std;
-
-int
-main(int argc, char **argv)
-{
-	return 0;
-}
diff --git a/test/build-pedantic.c b/test/build-pedantic.c
deleted file mode 100644
index b5f45a90..00000000
--- a/test/build-pedantic.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <libratbag.h>
-
-/* This is a build-test only */
-
-int
-main(void)
-{
-	return 0;
-}