diff options
| author | Jannis Pohlmann <jannis@xfce.org> | 2009-10-06 15:35:10 +0200 |
|---|---|---|
| committer | Jannis Pohlmann <jannis@xfce.org> | 2009-10-06 15:35:10 +0200 |
| commit | 107f638da92c8da10b3b34c8fb5ad81e1690c9cd (patch) | |
| tree | 556cb266277b9be9d594a68ab96f01aa67a1b760 /tumbler | |
| parent | 8daf819c6671a1d261731b169d228cecbb568644 (diff) | |
| download | tumbler-107f638da92c8da10b3b34c8fb5ad81e1690c9cd.tar.gz | |
Use xdg cache macro. Drop revision versioning. Drop MAINTAINER_MODE.
Don't generate the D-Bus C bindings before creating the dist tarball.
Instead, ship the XML infos and generate the bindings at build time.
This requires a separate check for dbus-binding-tool.
Diffstat (limited to 'tumbler')
| -rw-r--r-- | tumbler/Makefile.am | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/tumbler/Makefile.am b/tumbler/Makefile.am index e2023ce..9c33e47 100644 --- a/tumbler/Makefile.am +++ b/tumbler/Makefile.am @@ -81,8 +81,7 @@ libtumbler_1_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GTHREAD_CFLAGS) \ - $(PLATFORM_CFLAGS) \ - $(PNG_CFLAGS) + $(PLATFORM_CFLAGS) libtumbler_1_la_LDFLAGS = \ -no-undefined \ @@ -94,17 +93,15 @@ libtumbler_1_la_LIBADD = \ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ - $(GTHREAD_LIBS) \ - $(PNG_LIBS) + $(GTHREAD_LIBS) EXTRA_DIST = \ - tumbler-config.h.in + tumbler-config.h.in \ + tumbler-marshal.list pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = tumbler-1.pc -if MAINTAINER_MODE - DISTCLEANFILES = \ stamp-tumbler-marshal.h \ tumbler-config.h \ @@ -117,12 +114,12 @@ tumbler-marshal.h: stamp-tumbler-marshal.h @true stamp-tumbler-marshal.h: tumbler-marshal.list Makefile - cd $(srcdir) \ + cd $(builddir) \ && echo "#ifndef __TUMBLER_MARSHAL_H__" > xgen-emh \ && echo "#define __TUMBLER_MARSHAL_H__" >> xgen-emh \ && ( glib-genmarshal \ --prefix=tumbler_marshal \ - --header tumbler-marshal.list ) >> xgen-emh \ + --header $(srcdir)/tumbler-marshal.list ) >> xgen-emh \ && echo "#endif /* !__TUMBLER_MARSHAL_H__ */" >> xgen-emh \ && ( cmp -s xgen-emh tumbler-marshal.h \ || cp xgen-emh tumbler-marshal.h ) \ @@ -130,12 +127,10 @@ stamp-tumbler-marshal.h: tumbler-marshal.list Makefile && echo timestamp > $(@F) tumbler-marshal.c: tumbler-marshal.list Makefile - cd $(srcdir) \ + cd $(builddir) \ && echo "#include <tumbler/tumbler-marshal.h>" > xgen-emc \ && ( glib-genmarshal \ --prefix=tumbler_marshal \ - --body tumbler-marshal.list ) >> xgen-emc \ + --body $(srcdir)/tumbler-marshal.list ) >> xgen-emc \ && cp xgen-emc tumbler-marshal.c \ && rm -f xgen-emc - -endif |