[glib/meson-for-merge] gio: tests: rename generated giotypefunc.c to giotypefuncs.inc
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/meson-for-merge] gio: tests: rename generated giotypefunc.c to giotypefuncs.inc
- Date: Fri, 14 Jul 2017 00:20:53 +0000 (UTC)
commit f438c04fac22d31d43afef5f7666bf04dda75bf3
Author: Tim-Philipp Müller <tim centricular com>
Date: Sat Jan 28 17:00:41 2017 +0000
gio: tests: rename generated giotypefunc.c to giotypefuncs.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.
gio/tests/.gitignore | 2 +-
gio/tests/Makefile.am | 6 +++---
gio/tests/defaultvalue.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gio/tests/.gitignore b/gio/tests/.gitignore
index 3114790..a6942d2 100644
--- a/gio/tests/.gitignore
+++ b/gio/tests/.gitignore
@@ -80,7 +80,7 @@ gdbus-unix-addresses
glistmodel
gio-du
giomodule
-giotypefuncs.c
+giotypefuncs.inc
gnotification
gsubprocess
gsubprocess-testprog
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 8ba7626..acc1da4 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -566,9 +566,9 @@ EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.g
CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
endif # !CROSS_COMPILING
-BUILT_SOURCES += giotypefuncs.c
+BUILT_SOURCES += giotypefuncs.inc
-giotypefuncs.c: Makefile
+giotypefuncs.inc: Makefile
$(AM_V_GEN) echo '#include <gio/gio.h>' > xgen-giosrc.c && \
echo "G_GNUC_BEGIN_IGNORE_DEPRECATIONS" > xgen-gio && \
${CPP} $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-giosrc.c | \
@@ -578,7 +578,7 @@ giotypefuncs.c: Makefile
$(SED) -e 's/^/*tp++ = /' -e 's/$$/ ();/' >> xgen-gio && \
cp xgen-gio $@ # && rm -f xgen-gio xgen-giosrc.c
-CLEANFILES += xgen-giosrc.c xgen-gio giotypefuncs.c
+CLEANFILES += xgen-giosrc.c xgen-gio giotypefuncs.inc
if ENABLE_INSTALLED_TESTS
if OS_UNIX
diff --git a/gio/tests/defaultvalue.c b/gio/tests/defaultvalue.c
index 3225dbb..84a8635 100644
--- a/gio/tests/defaultvalue.c
+++ b/gio/tests/defaultvalue.c
@@ -174,7 +174,7 @@ list_all_types (void)
GType *tp;
all_registered_types = g_new0 (GType, 1000);
tp = all_registered_types;
-#include "giotypefuncs.c"
+#include "giotypefuncs.inc"
*tp = 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]