mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-09-05 23:48:44 +02:00
Rewrite glib-genmarshal in Python
We're in the process or rewriting other tools in Python to reduce the number of dependencies of GLib. Additionally, making glib-genmarshal a Python script reduces the complexity when cross-compiling, as we don't need a native build to generate the marshallers. https://bugzilla.gnome.org/show_bug.cgi?id=784528
This commit is contained in:
@@ -145,9 +145,7 @@ endif
|
||||
# that don't serve as direct make target sources, i.e. they don't have
|
||||
# their own .lo rules and don't get publically installed
|
||||
gobject_extra_sources = \
|
||||
gmarshal.list \
|
||||
gmarshal.strings
|
||||
|
||||
gmarshal.list
|
||||
|
||||
#
|
||||
# setup GObject library sources and their dependancies
|
||||
@@ -183,14 +181,6 @@ CLEANFILES += $(gen_sources)
|
||||
# ../configure will supress all autogeneration rules.
|
||||
|
||||
|
||||
gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list
|
||||
$(AM_V_GEN) grep '^[A-Z]' $(srcdir)/gmarshal.list \
|
||||
| $(SED) -e 's/^/"g_cclosure_marshal_/' -e 's/:/__/' -e 's/,/_/g' -e 's/$$/",/' > xgen-gms \
|
||||
&& cp xgen-gms gmarshal.strings \
|
||||
&& rm -f xgen-gms xgen-gms~
|
||||
|
||||
glib-genmarshal.o: gmarshal.strings
|
||||
|
||||
# target platform:
|
||||
libgobjectinclude_HEADERS = $(gobject_target_headers)
|
||||
libgobject_2_0_la_SOURCES = $(gobject_target_sources)
|
||||
@@ -198,14 +188,12 @@ libgobject_2_0_la_SOURCES = $(gobject_target_sources)
|
||||
#
|
||||
# programs to compile and install
|
||||
#
|
||||
bin_PROGRAMS = gobject-query glib-genmarshal
|
||||
bin_SCRIPTS = glib-mkenums
|
||||
bin_PROGRAMS = gobject-query
|
||||
bin_SCRIPTS = glib-mkenums glib-genmarshal
|
||||
# source files
|
||||
gobject_query_SOURCES = gobject-query.c
|
||||
glib_genmarshal_SOURCES = glib-genmarshal.c
|
||||
# link programs against libgobject
|
||||
progs_LDADD = ./libgobject-2.0.la $(libglib)
|
||||
glib_genmarshal_LDADD = $(libglib)
|
||||
gobject_query_LDADD = $(progs_LDADD)
|
||||
|
||||
#
|
||||
@@ -214,6 +202,7 @@ gobject_query_LDADD = $(progs_LDADD)
|
||||
EXTRA_DIST += \
|
||||
gobject.rc.in \
|
||||
libgobject-gdb.py.in \
|
||||
glib-genmarshal.in \
|
||||
glib-mkenums.in
|
||||
|
||||
CLEANFILES += libgobject-gdb.py
|
||||
|
Reference in New Issue
Block a user