From 02a815f78a426ebca270c0c8b2cd10da8f38e695 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 14 Sep 2005 20:19:44 +0000 Subject: [PATCH] - remove config.h from e.h and put it into the .c files that need it. e.h is an installed header so modules can be written outside the e tree. config.h isn't installed by e. so, if the module dosen't have a config.h and the local directory in their include path the build will fail. SVN revision: 16719 --- src/bin/e.h | 2 -- src/bin/e_hints.c | 1 + src/bin/e_int_menus.c | 1 + src/bin/e_intl.c | 1 + src/bin/e_main.c | 1 + src/bin/e_module.c | 1 + src/bin/e_prefix.c | 1 + src/modules/cpufreq/e_mod_main.c | 1 + 8 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index 4752a5059..95b9bfcd7 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -4,8 +4,6 @@ #ifndef E_H #define E_H -#include "config.h" - #include #include #include diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 8799efb23..5ce31eb16 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -2,6 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #include "e.h" +#include "config.h" void e_hints_init(void) diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index d54223245..f25319021 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -2,6 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #include "e.h" +#include "config.h" typedef struct _Main_Data Main_Data; diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index bc6a37906..c5811ba97 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -2,6 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #include "e.h" +#include "config.h" /* TODO List: * diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 984510bc1..b5cc1fb4d 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -2,6 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #include "e.h" +#include "config.h" /* local subsystem functions */ static void _e_main_shutdown_push(int (*func)(void)); diff --git a/src/bin/e_module.c b/src/bin/e_module.c index dae9d2208..57e147430 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -2,6 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #include "e.h" +#include "config.h" /* TODO List: * diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c index 9765fe4e5..a99add951 100644 --- a/src/bin/e_prefix.c +++ b/src/bin/e_prefix.c @@ -2,6 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ #include "e.h" +#include "config.h" /* local subsystem functions */ static int _e_prefix_fallbacks(void); diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index e768b199e..99d987d8e 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -5,6 +5,7 @@ #include #include #include "e_mod_main.h" +#include "config.h" #ifdef __FreeBSD__ #include