[sushi] Don't generate/include unused config.h
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sushi] Don't generate/include unused config.h
- Date: Wed, 12 Sep 2018 11:55:38 +0000 (UTC)
commit 38c26d6466da16a9d286f4f83fa1f76050ae2662
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Sep 3 19:22:23 2018 -0700
Don't generate/include unused config.h
src/libsushi/meson.build | 3 +--
src/libsushi/sushi-file-loader.c | 2 --
src/main.c | 2 --
src/meson.build | 18 ------------------
4 files changed, 1 insertion(+), 24 deletions(-)
---
diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build
index 8f75271..c8ff6fa 100644
--- a/src/libsushi/meson.build
+++ b/src/libsushi/meson.build
@@ -36,8 +36,7 @@ libsushi = shared_library(
libsushi_headers,
],
install: true,
- install_dir: join_paths(libdir, 'sushi'),
- include_directories: include_dirs,
+ install_dir: join_paths(libdir, 'sushi')
)
# We use that later on to link the sushi-start executable against libsushi
diff --git a/src/libsushi/sushi-file-loader.c b/src/libsushi/sushi-file-loader.c
index eddd74c..a88d9c3 100644
--- a/src/libsushi/sushi-file-loader.c
+++ b/src/libsushi/sushi-file-loader.c
@@ -23,8 +23,6 @@
*
*/
-#include <config.h>
-
#include "sushi-file-loader.h"
#include <gtk/gtk.h>
diff --git a/src/main.c b/src/main.c
index 948441f..5057d89 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,8 +23,6 @@
*
*/
-#include <config.h>
-
#include <stdlib.h>
#include <glib.h>
diff --git a/src/meson.build b/src/meson.build
index 87b9b8f..ff63a50 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,24 +25,6 @@ deps = [
webkit_dep,
]
-# This actually doesn't do anything,
-# but main.c includes config.h, so we need to have some value in it
-conf_h = configuration_data()
-conf_h.set_quoted(
- 'PACKAGE_NAME',
- 'sushi',
-)
-
-configure_file(
- output: 'config.h',
- configuration: conf_h,
-)
-
-# Include the just generated config.h
-include_dirs = [
- include_directories('.'),
-]
-
# Compile libsushi and its introspection data
subdir('libsushi')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]