diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-23 12:32:34 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-23 12:32:34 +0800 |
| commit | fc1a6b4088eebe2d9e6d923e73f4706062c06094 (patch) | |
| tree | b368c4476c8489862ebafc858be6afacb9eb9580 | |
| parent | 535f3ef13637c2edc0462d9c38bcb518d1bd8bcb (diff) | |
| download | gsoc2013-evolution-fc1a6b4088eebe2d9e6d923e73f4706062c06094.tar.gz gsoc2013-evolution-fc1a6b4088eebe2d9e6d923e73f4706062c06094.tar.zst gsoc2013-evolution-fc1a6b4088eebe2d9e6d923e73f4706062c06094.zip | |
Remove EVO_MARSHAL_RULE.
Use glib-gen.mak instead.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libgnomecanvas/Makefile.am | 5 | ||||
| -rw-r--r-- | marshal.mk | 7 |
3 files changed, 3 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 133161eae4..aef2f5ee44 100644 --- a/configure.ac +++ b/configure.ac @@ -1112,10 +1112,6 @@ dnl GObject marshalling dnl ******************* AM_PATH_GLIB_2_0 -dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines -EVO_MARSHAL_RULE=$srcdir/marshal.mk -AC_SUBST_FILE(EVO_MARSHAL_RULE) - dnl ***************************************************************** dnl Utility macro to set compiler flags for a specific lib. dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS) diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am index b1e56371ff..e0719ecfa1 100644 --- a/libgnomecanvas/Makefile.am +++ b/libgnomecanvas/Makefile.am @@ -65,12 +65,13 @@ libgnomecanvas_la_SOURCES = \ gnome-canvas.c \ libgnomecanvastypes.c +include $(top_srcdir)/glib-gen.mak +glib_enum_prefix=gnome_canvas + MARSHAL_GENERATED = \ gnome-canvas-marshal.c \ gnome-canvas-marshal.h -@EVO_MARSHAL_RULE@ - libgnomecanvas_la_LIBADD = \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ $(GNOME_PLATFORM_LIBS) diff --git a/marshal.mk b/marshal.mk deleted file mode 100644 index 5da83b80ec..0000000000 --- a/marshal.mk +++ /dev/null @@ -1,7 +0,0 @@ -%.h: %.list - ( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $< --header > $@.tmp \ - && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) - -%.c: %.list %.h - ( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $(srcdir)/$*.list --body) > $@.tmp \ - && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) |