diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-06-10 05:57:24 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-06-14 18:55:32 +0800 |
| commit | 8d08871ace1019111a50c47f473f565e4cb47307 (patch) | |
| tree | a9628e45c2f891d2d2da2268ea487aedb241817e /lib/Makefile.am | |
| parent | 42fc55f3abdabe3e17e5abd8ff78e68fa1ae5626 (diff) | |
| download | gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.gz gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.zst gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.zip | |
Use the generic marshaler throughout
Just enough to get rid of ephy-marshal.h
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 63d58db1e..a75896bb0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -125,9 +125,7 @@ ephy_profile_migrator_CPPFLAGS = \ BUILT_SOURCES = \ ephy-lib-type-builtins.c \ - ephy-lib-type-builtins.h \ - ephy-marshal.c \ - ephy-marshal.h + ephy-lib-type-builtins.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) @@ -135,21 +133,7 @@ MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-lib-type-builtins.c \ - stamp-ephy-lib-type-builtins.h \ - stamp-ephy-marshal.c \ - stamp-ephy-marshal.h - -ephy-marshal.c: stamp-ephy-marshal.c - @true -stamp-ephy-marshal.c: ephy-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header --body > ephy-marshal.c \ - && echo timestamp > $(@F) - -ephy-marshal.h: stamp-ephy-marshal.h - @true -stamp-ephy-marshal.h: ephy-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header > ephy-marshal.h \ - && echo timestamp > $(@F) + stamp-ephy-lib-type-builtins.h ephy-lib-type-builtins.c: stamp-ephy-lib-type-builtins.c Makefile @true @@ -192,6 +176,3 @@ stamp-ephy-lib-type-builtins.h: Makefile $(TYPES_H_FILES) && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) - -EXTRA_DIST = \ - ephy-marshal.list |