Generate config.h

This allows us to remove a lot of #ifdef's. Either we want to use a config.h or we don't. Since we'll want it for e.g. optional gsound support later on let's have it.
2019-07-17 19:40:52 +02:00
parent c65583b911
commit dbc8cc14bc
30 changed files with 19 additions and 52 deletions
--- a/eek/config.h
+++ b/eek/config.h
--- a/eek/eek-container.c
+++ b/eek/eek-container.c
@ -26,9 +26,7 @@
 * shall be used to implement #EekKeyboard and #EekSection.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-container.h"

--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@ -26,9 +26,7 @@
 * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <string.h>

--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -23,9 +23,7 @@
 * @short_description: a #GtkWidget displaying #EekKeyboard
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@ -18,9 +18,7 @@
 * 02110-1301 USA
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@ -25,9 +25,7 @@
 * The #EekKeyClass class represents a key.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <string.h>

--- a/eek/eek-keyboard-drawing.c
+++ b/eek/eek-keyboard-drawing.c
@ -17,9 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <math.h>
 #include <pango/pangocairo.h>
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -27,9 +27,7 @@
 * of one or more sections of the #EekSectionClass class.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-keyboard.h"
 #include "eek-marshalers.h"
--- a/eek/eek-keysym.c
+++ b/eek/eek-keysym.c
@ -23,9 +23,7 @@
 * @short_description: an #EekSymbol represents an X keysym
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <string.h>
 #include <stdlib.h>
--- a/eek/eek-layout.c
+++ b/eek/eek-layout.c
@ -26,9 +26,7 @@
 * arranges keyboard elements.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-layout.h"
 #include "eek-keyboard.h"
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -18,9 +18,7 @@
 * 02110-1301 USA
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <math.h>
 #include <string.h>
--- a/eek/eek-section.c
+++ b/eek/eek-section.c
@ -27,9 +27,7 @@
 * of one or more keys of the #EekKeyClass class.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <string.h>

--- a/eek/eek-serializable.c
+++ b/eek/eek-serializable.c
@ -27,9 +27,7 @@
 * method.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-serializable.h"

--- a/eek/eek-symbol.c
+++ b/eek/eek-symbol.c
@ -25,9 +25,7 @@
 * The #EekSymbolClass class represents a symbol assigned to a key.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-symbol.h"
 #include "eek-serializable.h"
--- a/eek/eek-text.c
+++ b/eek/eek-text.c
@ -23,9 +23,7 @@
 * @short_description: an #EekText represents a text symbol
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-text.h"
 #include "eek-serializable.h"
--- a/eek/eek-theme-context.c
+++ b/eek/eek-theme-context.c
@ -19,9 +19,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek-theme.h"
 #include "eek-theme-context.h"
--- a/eek/eek-theme-node.c
+++ b/eek/eek-theme-node.c
@ -23,9 +23,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <stdlib.h>
 #include <string.h>
--- a/eek/eek-types.c
+++ b/eek/eek-types.c
@ -24,9 +24,7 @@
 * @short_description: Miscellaneous types used in Libeek
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <string.h>
 #include <math.h>
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -21,9 +21,7 @@
 * @short_description: Layout engine which loads layout information from XML
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <gio/gio.h> /* GResource */
 #include <stdlib.h>
--- a/eek/eek-xml.c
+++ b/eek/eek-xml.c
@ -22,9 +22,7 @@
 * @short_description: #EekKeyboard to XML conversion utilities
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <stdio.h>
 #include <stdarg.h>
--- a/eek/eek.c
+++ b/eek/eek.c
@ -23,9 +23,7 @@
 * @title: Library Initialization
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek.h"

--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -25,9 +25,7 @@
 * implementation of eekboard input context service.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eekboard/eekboard-context-service.h"

--- a/eekboard/eekboard-context.c
+++ b/eekboard/eekboard-context.c
@ -24,9 +24,7 @@
 * context.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eekboard/eekboard-context.h"
 //#include "eekboard/eekboard-marshalers.h"
--- a/eekboard/eekboard-service.c
+++ b/eekboard/eekboard-service.c
@ -26,9 +26,7 @@
 * implementation of eekboard service.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eekboard/eekboard-service.h"

--- a/meson.build
+++ b/meson.build
@ -9,6 +9,8 @@ project(

 i18n = import('i18n')

+conf_data = configuration_data()
+
 if get_option('buildtype').startswith('debug')
    add_project_arguments('-DDEBUG=1', language : 'c')
 endif
@ -26,6 +28,16 @@ else
 endif
 dbusdir = join_paths(depdatadir, 'dbus-1/interfaces')

+summary = [
+        '',
+        '------------------',
+        'squeekboard @0@'.format(meson.project_version()),
+        '',
+        '------------------',
+        ''
+]
+message('\n'.join(summary))
+
 subdir('data')
 subdir('protocols')
 subdir('eek')
--- a/src/config.h.in
+++ b/src/config.h.in
@ -0,0 +1,4 @@
+/*
+ * Autogenerated by the Meson build system.
+ * Do not edit, your changes will be lost.
+ */
--- a/src/meson.build
+++ b/src/meson.build
@ -4,7 +4,10 @@ dbus_src = gnome.gdbus_codegen(
    join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
 )

+config_h = configure_file(input: 'config.h.in', output: 'config.h',configuration: conf_data)
+
 sources = [
+  config_h,
  'imservice.c',
  'server-context-service.c',
  'server-main.c',
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -15,9 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
--- a/src/server-main.c
+++ b/src/server-main.c
@ -23,9 +23,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #if HAVE_CLUTTER_GTK
 #include <clutter-gtk/clutter-gtk.h>
--- a/tests/eek-xml-test.c
+++ b/tests/eek-xml-test.c
@ -21,9 +21,7 @@
 /* For gdk_x11_display_get_xdisplay().  See main(). */
 #include <gtk/gtk.h>

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */

 #include "eek/eek.h"