diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-03-25 08:52:46 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-03-25 13:32:39 +1000 |
commit | 70e6090c4683065ae07f131adb5638a39ae9ee22 (patch) | |
tree | be43b0db1feaaceeb7162f33f6d21f135803dbe9 | |
parent | 0e2af90cdde50122ba0582ec87ce782c9d12f1ac (diff) | |
download | libwacom-70e6090c4683065ae07f131adb5638a39ae9ee22.tar.gz |
meson.build: generate a config.h file
Currently empty but this allows us to remove the HAVE_CONFIG_H - autotools
always generates that one after all.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | libwacom/libwacom-database.c | 2 | ||||
-rw-r--r-- | libwacom/libwacom-deprecated.c | 2 | ||||
-rw-r--r-- | libwacom/libwacom-error.c | 2 | ||||
-rw-r--r-- | libwacom/libwacom.c | 2 | ||||
-rw-r--r-- | libwacom/libwacomint.h | 2 | ||||
-rw-r--r-- | libwacom/util-strings.h | 2 | ||||
-rw-r--r-- | meson.build | 8 | ||||
-rw-r--r-- | test/test-dbverify.c | 2 | ||||
-rw-r--r-- | test/test-deprecated.c | 2 | ||||
-rw-r--r-- | test/test-load.c | 2 | ||||
-rw-r--r-- | test/test-stylus-validity.c | 2 | ||||
-rw-r--r-- | test/test-tablet-svg-validity.c | 2 | ||||
-rw-r--r-- | test/test-tablet-validity.c | 2 | ||||
-rw-r--r-- | tools/list-compatible-styli.c | 2 | ||||
-rw-r--r-- | tools/list-devices.c | 2 | ||||
-rw-r--r-- | tools/list-local-devices.c | 2 |
16 files changed, 8 insertions, 30 deletions
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c index 38da050..634684c 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE 1 #include "libwacomint.h" diff --git a/libwacom/libwacom-deprecated.c b/libwacom/libwacom-deprecated.c index 0411d85..dcbe469 100644 --- a/libwacom/libwacom-deprecated.c +++ b/libwacom/libwacom-deprecated.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE #include <stdio.h> diff --git a/libwacom/libwacom-error.c b/libwacom/libwacom-error.c index 98b64af..7fb1cc3 100644 --- a/libwacom/libwacom-error.c +++ b/libwacom/libwacom-error.c @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c index 59d7ce0..3d8d140 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "libwacomint.h" #include <assert.h> diff --git a/libwacom/libwacomint.h b/libwacom/libwacomint.h index 795cf21..23cd999 100644 --- a/libwacom/libwacomint.h +++ b/libwacom/libwacomint.h @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifndef _LIBWACOMINT_H_ #define _LIBWACOMINT_H_ diff --git a/libwacom/util-strings.h b/libwacom/util-strings.h index 33603e5..dc2f59c 100644 --- a/libwacom/util-strings.h +++ b/libwacom/util-strings.h @@ -24,9 +24,7 @@ #pragma once -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <assert.h> #include <ctype.h> diff --git a/meson.build b/meson.build index dfc099d..d3d2c0c 100644 --- a/meson.build +++ b/meson.build @@ -57,6 +57,9 @@ dep_glib = dependency('glib-2.0') includes_include = include_directories('include') includes_src = include_directories('libwacom') +# config.h +config_h = configuration_data() + #################### libwacom.so ######################## src_libwacom = [ 'include/linux/input-event-codes.h', @@ -315,4 +318,9 @@ test_ltversion = executable('test-ltversion', install: false) test('test-ltversion', test_ltversion, suite: ['all']) + + +############ output files ############ +configure_file(output: 'config.h', configuration: config_h) + # vim: set noexpandtab tabstop=8 shiftwidth=8: diff --git a/test/test-dbverify.c b/test/test-dbverify.c index 9675da5..44646c6 100644 --- a/test/test-dbverify.c +++ b/test/test-dbverify.c @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE #include <glib.h> diff --git a/test/test-deprecated.c b/test/test-deprecated.c index 7395fdc..c2a1303 100644 --- a/test/test-deprecated.c +++ b/test/test-deprecated.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <assert.h> #include <dlfcn.h> diff --git a/test/test-load.c b/test/test-load.c index fc6b7ae..10938b0 100644 --- a/test/test-load.c +++ b/test/test-load.c @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <linux/input-event-codes.h> #include <glib.h> diff --git a/test/test-stylus-validity.c b/test/test-stylus-validity.c index 642b0c3..850a40b 100644 --- a/test/test-stylus-validity.c +++ b/test/test-stylus-validity.c @@ -21,9 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE #include <glib.h> diff --git a/test/test-tablet-svg-validity.c b/test/test-tablet-svg-validity.c index 7492cc4..8b351b7 100644 --- a/test/test-tablet-svg-validity.c +++ b/test/test-tablet-svg-validity.c @@ -24,9 +24,7 @@ * Olivier Fourdan <ofourdan@redhat.com> */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c index 9e5b02f..2095089 100644 --- a/test/test-tablet-validity.c +++ b/test/test-tablet-validity.c @@ -24,9 +24,7 @@ * Peter Hutterer (peter.hutterer@redhat.com) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE #include <glib.h> diff --git a/tools/list-compatible-styli.c b/tools/list-compatible-styli.c index bc4c0ca..277e75c 100644 --- a/tools/list-compatible-styli.c +++ b/tools/list-compatible-styli.c @@ -24,9 +24,7 @@ * Peter Hutterer <peter.hutterer@redhat.com> */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE #include <stdio.h> diff --git a/tools/list-devices.c b/tools/list-devices.c index 574d746..f797b14 100644 --- a/tools/list-devices.c +++ b/tools/list-devices.c @@ -24,9 +24,7 @@ * Peter Hutterer <peter.hutterer@redhat.com> */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define _GNU_SOURCE #include <stdio.h> diff --git a/tools/list-local-devices.c b/tools/list-local-devices.c index 2017860..5fffe40 100644 --- a/tools/list-local-devices.c +++ b/tools/list-local-devices.c @@ -24,9 +24,7 @@ * Peter Hutterer <peter.hutterer@redhat.com> */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> |