[retro-gtk/c-port: 36/42] build: Drop Vala-generated C headers
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk/c-port: 36/42] build: Drop Vala-generated C headers
- Date: Wed, 4 Oct 2017 05:25:25 +0000 (UTC)
commit d851141687b442c3728a051fe3311491006b3607
Author: Adrien Plazas <kekun plazas laposte net>
Date: Mon Sep 25 22:21:56 2017 +0200
build: Drop Vala-generated C headers
retro-gtk/Makefile.am | 30 +-----------------------------
retro-gtk/retro-core-private.h | 1 -
retro-gtk/retro-core-view-input-device.h | 1 -
retro-gtk/retro-core-view.c | 1 -
retro-gtk/retro-environment.c | 1 -
retro-gtk/retro-gtk.h | 1 -
retro-gtk/retro-main-loop.c | 2 --
retro-gtk/retro-module-iterator.c | 2 --
retro-gtk/retro-module-query.c | 2 --
retro-gtk/retro-pa-player.c | 1 -
10 files changed, 1 insertions(+), 41 deletions(-)
---
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 9c5ddfe..0a28793 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -27,8 +27,6 @@ vapidir = $(datadir)/vala/vapi
vapi_DATA = retro-gtk-0.12.vapi
dist_vapi_DATA = retro-gtk-0.12.deps
-BUILT_SOURCES = retro-gtk-internal.h
-
retro_gtk_public_h_sources = \
retro-analog-id.h \
retro-analog-index.h \
@@ -102,30 +100,6 @@ libretro_gtk_la_SOURCES = \
video/retro-video-converter.c \
$(NULL)
-video/retro-video-converter.c: retro-gtk-internal.h
-
-retro-core.c: retro-gtk-internal.h
-
-# retro-core-descriptor.c: retro-gtk-internal.h
-
-retro-core-view.c: retro-gtk-internal.h
-
-retro-core-view-input-device.c: retro-gtk-internal.h
-
-retro-environment.c: retro-gtk-internal.h libretro-environment.h
-
-retro-log.c: retro-gtk-internal.h
-
-retro-main-loop.c: retro-gtk-internal.h
-
-retro-module.c: retro-gtk-internal.h
-
-retro-module-iterator.c: retro-gtk-internal.h
-
-retro-module-query.c: retro-gtk-internal.h
-
-retro-pa-player.c: retro-gtk-internal.h
-
libretro_gtk_la_LDFLAGS =
libretro_gtk_la_VALAFLAGS = \
@@ -143,8 +117,6 @@ libretro_gtk_la_VALAFLAGS = \
--thread \
--target-glib 2.32 \
--library retro-gtk-0.12 \
- -H retro-gtk-vala.h \
- -h retro-gtk-internal.h \
-X -fPIC -X -shared \
$(NULL)
@@ -172,7 +144,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
introspection_sources = $(retro_gtkinclude_HEADERS) $(libretro_gtk_la_SOURCES)
-BUILT_SOURCES += libretro-gtk.la Retro-0.12.gir
+BUILT_SOURCES = libretro-gtk.la Retro-0.12.gir
Retro-0.12.gir: $(INTROSPECTION_SCANNER) libretro-gtk.la
Retro_0_12_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0 Gtk-3.0 cairo-1.0
diff --git a/retro-gtk/retro-core-private.h b/retro-gtk/retro-core-private.h
index 2525fe0..5a082fb 100644
--- a/retro-gtk/retro-core-private.h
+++ b/retro-gtk/retro-core-private.h
@@ -9,7 +9,6 @@
#include "retro-core.h"
#include "retro-disk-control-callback.h"
-#include "retro-gtk-internal.h"
#include "retro-module.h"
#include "retro-options.h"
#include "retro-pixel-format.h"
diff --git a/retro-gtk/retro-core-view-input-device.h b/retro-gtk/retro-core-view-input-device.h
index ef9743b..2ec708d 100644
--- a/retro-gtk/retro-core-view-input-device.h
+++ b/retro-gtk/retro-core-view-input-device.h
@@ -10,7 +10,6 @@
#include <glib-object.h>
#include "retro-core-view.h"
#include "retro-device-type.h"
-#include "retro-gtk-internal.h"
G_BEGIN_DECLS
diff --git a/retro-gtk/retro-core-view.c b/retro-gtk/retro-core-view.c
index 1c1aa9d..6b35bac 100644
--- a/retro-gtk/retro-core-view.c
+++ b/retro-gtk/retro-core-view.c
@@ -1,7 +1,6 @@
// This file is part of retro-gtk. License: GPL-3.0+.
#include <linux/input-event-codes.h>
-#include "retro-gtk-internal.h"
#include "retro-cairo-display.h"
#include "retro-core-view.h"
#include "retro-core-view-input-device.h"
diff --git a/retro-gtk/retro-environment.c b/retro-gtk/retro-environment.c
index 8572480..9514509 100644
--- a/retro-gtk/retro-environment.c
+++ b/retro-gtk/retro-environment.c
@@ -1,6 +1,5 @@
// This file is part of retro-gtk. License: GPL-3.0+.
-#include "retro-gtk-internal.h"
#include "libretro-environment.h"
#include "retro-core-private.h"
diff --git a/retro-gtk/retro-gtk.h b/retro-gtk/retro-gtk.h
index ff88830..71ac605 100644
--- a/retro-gtk/retro-gtk.h
+++ b/retro-gtk/retro-gtk.h
@@ -14,7 +14,6 @@
#include "retro-core.h"
#include "retro-core-view.h"
#include "retro-device-type.h"
-#include "retro-gtk-vala.h"
#include "retro-input-descriptor.h"
#include "retro-input-device.h"
#include "retro-joypad-id.h"
diff --git a/retro-gtk/retro-main-loop.c b/retro-gtk/retro-main-loop.c
index 5820792..8973bd4 100644
--- a/retro-gtk/retro-main-loop.c
+++ b/retro-gtk/retro-main-loop.c
@@ -2,8 +2,6 @@
#include "retro-main-loop.h"
-#include "retro-gtk-internal.h"
-
struct _RetroMainLoop
{
GObject parent_instance;
diff --git a/retro-gtk/retro-module-iterator.c b/retro-gtk/retro-module-iterator.c
index 2cc4063..5a0045f 100644
--- a/retro-gtk/retro-module-iterator.c
+++ b/retro-gtk/retro-module-iterator.c
@@ -1,7 +1,5 @@
// This file is part of retro-gtk. License: GPL-3.0+.
-#include "retro-gtk-internal.h"
-
#include "retro-module-iterator.h"
struct _RetroModuleIterator
diff --git a/retro-gtk/retro-module-query.c b/retro-gtk/retro-module-query.c
index 45476fd..da5c2c8 100644
--- a/retro-gtk/retro-module-query.c
+++ b/retro-gtk/retro-module-query.c
@@ -2,8 +2,6 @@
#include "retro-module-query.h"
-#include "retro-gtk-internal.h"
-
struct _RetroModuleQuery
{
GObject parent_instance;
diff --git a/retro-gtk/retro-pa-player.c b/retro-gtk/retro-pa-player.c
index d86e82e..a8127f5 100644
--- a/retro-gtk/retro-pa-player.c
+++ b/retro-gtk/retro-pa-player.c
@@ -4,7 +4,6 @@
#include <pulse/simple.h>
#include <pulse/pulseaudio.h>
-#include "retro-gtk-internal.h"
struct _RetroPaPlayer
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]