[gtk+/wip/meson: 37/73] Rename generated gtktypefuncs.c to gtktypefuncs.inc
- From: Tim-Philipp Müller <tpm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson: 37/73] Rename generated gtktypefuncs.c to gtktypefuncs.inc
- Date: Wed, 22 Mar 2017 09:35:11 +0000 (UTC)
commit 596d5a93d6f62d7b14b3ed43353c898ca9c0e88b
Author: Tim-Philipp Müller <tim centricular com>
Date: Sun Feb 5 13:41:38 2017 +0000
Rename generated gtktypefuncs.c to gtktypefuncs.inc
This is needed for the Meson port, a file name .c that's included
and shouldn't be compiled into an object is difficult to manage
otherwise. And it's not actually a valid .c file anyway.
gtk/Makefile.am | 6 +++---
gtk/gtktestutils.c | 2 +-
gtk/makefile.msc.in | 6 +++---
gtk/meson.build | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9920ed8..b022b4c 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1088,7 +1088,7 @@ gtk_built_sources = \
gtkresources.c \
gtk.gresource.xml \
gtktypebuiltins.c \
- gtktypefuncs.c \
+ gtktypefuncs.inc \
gtkmarshalers.c \
gtkprivatetypebuiltins.c
@@ -1342,7 +1342,7 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
&& rm -f xgen-gptbc
-gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h
$(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gdk/*.h Makefile
+gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h
$(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gdk/*.h Makefile
$(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtk.h>') > xgen-gtfsrc.c && \
echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
@@ -1350,7 +1350,7 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src
sort | uniq | \
$(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }'
xgen-gtf \
&& cp xgen-gtf $@ && rm -f xgen-gtf
-gtktestutils.c: gtktypefuncs.c
+gtktestutils.c: gtktypefuncs.inc
# target platform:
lib_LTLIBRARIES = libgtk-4.la
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 8bba8b0..83d2a46 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -181,7 +181,7 @@ gtk_test_register_all_types (void)
GType *tp;
all_registered_types = g_new0 (GType, max_gtk_types);
tp = all_registered_types;
-#include <gtktypefuncs.c>
+#include <gtktypefuncs.inc>
n_all_registered_types = tp - all_registered_types;
g_assert (n_all_registered_types + 1 < max_gtk_types);
*tp = 0;
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index a2b2035..01515e8 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -58,7 +58,7 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
GENERATED = \
gtktypebuiltins.h gtktypebuiltins.c \
gtkmarshalers.h gtkmarshalers.c \
- gtk.def gtktypefuncs.c
+ gtk.def gtktypefuncs.inc
all : \
..\config.h \
@@ -576,8 +576,8 @@ gtkmarshalers.h : gtkmarshalers.list makefile.msc
gtkmarshalers.c : gtkmarshalers.list makefile.msc
$(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >gtkmarshalers.c
-gtktypefuncs.c : makefile.msc
- echo /*none*/ > gtktypefuncs.c
+gtktypefuncs.inc : makefile.msc
+ echo /*none*/ > gtktypefuncs.inc
gtk-win32.res : gtk-win32.rc
rc -DBUILDNUMBER=0 -r -fo gtk-win32.res gtk-win32.rc
diff --git a/gtk/meson.build b/gtk/meson.build
index 6a0cffd..c2ec797 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -681,11 +681,11 @@ gtkprivatetypebuiltins_c = custom_target(
)
gentypefuncs_prog = find_program('gentypefuncs.py')
-# Generate gtktypefuncs.c
+# Generate gtktypefuncs.inc
typefuncs = custom_target(
'typefuncs',
depends: gdkenum_h,
- output : 'gtktypefuncs.c',
+ output : 'gtktypefuncs.inc',
input : gdk_headers + gtk_public_headers + gtk_deprecated_headers + gtk_private_headers +
[gtktypebuiltins_h] + [gdkenum_h],
command: [gentypefuncs_prog, '@OUTPUT@', '@INPUT@'],
install: false,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]