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.
This commit is contained in:
Tim-Philipp Müller 2017-01-28 17:00:41 +00:00 committed by Matthias Clasen
parent 33fb1bbb61
commit f438c04fac
3 changed files with 5 additions and 5 deletions

View File

@ -80,7 +80,7 @@ gdbus-unix-addresses
glistmodel
gio-du
giomodule
giotypefuncs.c
giotypefuncs.inc
gnotification
gsubprocess
gsubprocess-testprog

View File

@ -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

View File

@ -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;
}