[Libosinfo] [osinfo-db-tools PATCH 1/8] tools: Don't import config.h
Fabiano Fidêncio
fidencio at redhat.com
Thu Jun 20 15:21:20 UTC 2019
As config.h is not used, at all, in osinfo-db-tools, let's just stop
generating and including the file.
Together with this change, let's also drop both sc_require_config_h and
sc_require_config_h_first checks from `make syntax-check`.
Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
cfg.mk | 4 +++-
configure.ac | 1 -
tools/osinfo-db-export.c | 2 --
tools/osinfo-db-import.c | 2 --
tools/osinfo-db-path.c | 2 --
tools/osinfo-db-util.c | 2 --
tools/osinfo-db-validate.c | 2 --
7 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 570bbb2..caa62ac 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -33,7 +33,9 @@ local-checks-to-skip = \
sc_two_space_separator_in_usage \
sc_error_message_uppercase \
sc_program_name \
- sc_makefile_check
+ sc_makefile_check \
+ sc_require_config_h \
+ sc_require_config_h_first
# Files that should never cause syntax check failures.
VC_LIST_ALWAYS_EXCLUDE_REGEX = \
diff --git a/configure.ac b/configure.ac
index 4df1139..e32af7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,6 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11.1 foreign color-tests tar-ustar])
AC_PREREQ([2.61])
AC_CONFIG_SRCDIR([tools/osinfo-db-validate.c])
-AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
AC_PROG_LN_S
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index eef6688..8fa9889 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -20,8 +20,6 @@
* Daniel P. Berrange <berrange at redhat.com>
*/
-#include <config.h>
-
#include <locale.h>
#include <glib/gi18n.h>
#include <stdlib.h>
diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index 675961d..026b895 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -20,8 +20,6 @@
* Daniel P. Berrange <berrange at redhat.com>
*/
-#include <config.h>
-
#include <locale.h>
#include <glib/gi18n.h>
#include <glib-object.h>
diff --git a/tools/osinfo-db-path.c b/tools/osinfo-db-path.c
index 8ef7e55..e38758b 100644
--- a/tools/osinfo-db-path.c
+++ b/tools/osinfo-db-path.c
@@ -20,8 +20,6 @@
* Daniel P. Berrange <berrange at redhat.com>
*/
-#include <config.h>
-
#include <locale.h>
#include <glib/gi18n.h>
#include <stdlib.h>
diff --git a/tools/osinfo-db-util.c b/tools/osinfo-db-util.c
index 1030b06..40c6079 100644
--- a/tools/osinfo-db-util.c
+++ b/tools/osinfo-db-util.c
@@ -20,8 +20,6 @@
* Daniel P. Berrange <berrange at redhat.com>
*/
-#include <config.h>
-
#include <glib/gi18n.h>
#include "osinfo-db-util.h"
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index 7fd87d2..97db5f2 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -20,8 +20,6 @@
* Daniel P. Berrange <berrange at redhat.com>
*/
-#include <config.h>
-
#include <libxml/relaxng.h>
#include <locale.h>
#include <glib/gi18n.h>
--
2.21.0
More information about the Libosinfo
mailing list