diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-06-07 21:04:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-07 21:04:46 +0000 |
| commit | 6803a2d7972a2ce016520d4bfacf1bd26c00fd29 (patch) | |
| tree | 79ad7b1912623b19198c3485704c3bcddc3ff835 | |
| parent | eda68be2987a1d393b1e42ed2cadd9cdb079a27d (diff) | |
| download | atk-6803a2d7972a2ce016520d4bfacf1bd26c00fd29.tar.gz | |
Really fix marshal generation.
Thu Jun 7 17:03:37 2001 Owen Taylor <otaylor@redhat.com>
* atk/Makefile.am: Really fix marshal generation.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | atk/Makefile.am | 48 |
2 files changed, 27 insertions, 25 deletions
@@ -1,3 +1,7 @@ +Thu Jun 7 17:03:37 2001 Owen Taylor <otaylor@redhat.com> + + * atk/Makefile.am: Really fix marshal generation. + 2001-06-07 Havoc Pennington <hp@redhat.com> * atk/Makefile.am ($(srcdir)/atkmarshal.c): fix up the diff --git a/atk/Makefile.am b/atk/Makefile.am index d0acc10..7a2b17c 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -26,12 +26,9 @@ libatk_la_SOURCES = \ atkutil.c \ atkvalue.c -ATK_MARSHALFILES = atkmarshal.h atkmarshal.list atkmarshal.c -EXTRA_DIST += atkmarshal.c atkmarshal.list +EXTRA_DIST += atkmarshal.list MAINTAINERCLEANFILES += atkmarshal.c -Makefile: $(ATK_MARSHALFILES) - INCLUDES = \ -I$(top_srcdir) \ @DEP_CFLAGS@ @@ -64,27 +61,28 @@ libatkinclude_HEADERS = \ atkutil.h \ atkvalue.h -# initial creation of the real stamp-* files -atk.defs atkmarshal.h : # never add deps here - test -f "$(srcdir)/$@" || touch $(srcdir)/$@ +$(libatk_la_OBJECTS): atkmarshal.c atkmarshal.h -$(srcdir)/stamp-atkmarshal.h: @REBUILD@ atkmarshal.list atkmarshal.h - case @GLIB_GENMARSHAL@ in \ - /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ - *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ - esac; \ - cd $(srcdir) \ - && $$glib_genmarshal --prefix=atk_marshal atkmarshal.list --header >> xgen-gmh \ - && (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h) \ - && rm -f xgen-gmh xgen-gmh~ \ +atkmarshal.h: @REBUILD@ stamp-atkmarshal.h + @true +stamp-atkmarshal.h: atkmarshal.list + case @GLIB_GENMARSHAL@ in \ + .*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + esac; \ + $$glib_genmarshal --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh \ + && (cmp -s xgen-gmh $(srcdir)/atkmarshal.h || cp xgen-gmh $(srcdir)/atkmarshal.h) \ + && rm -f xgen-gmh xgen-gmh~ \ && echo timestamp > $(@F) -$(srcdir)/atkmarshal.c: @REBUILD@ $(srcdir)/stamp-atkmarshal.h - case @GLIB_GENMARSHAL@ in \ - /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ - *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ - esac; \ - cd $(srcdir) \ - && $$glib_genmarshal --prefix=atk_marshal atkmarshal.list --body >> xgen-gmc \ - && cp xgen-gmc atkmarshal.c \ - && rm -f xgen-gmc xgen-gmc~ +atkmarshal.c: @REBUILD@ stamp-atkmarshal.c + @true +stamp-atkmarshal.c: atkmarshal.list + case @GLIB_GENMARSHAL@ in \ + .*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + esac; \ + $$glib_genmarshal --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc \ + && (cmp -s xgen-gmc $(srcdir)/atkmarshal.c || cp xgen-gmc $(srcdir)/atkmarshal.c) \ + && rm -f xgen-gmc xgen-gmc~ \ + && echo timestamp > $(@F) |