[Xfce4-commits] <xfdesktop:master> Fix distcheck.

[Nick Schermer]

Updating branch refs/heads/master
         to 456dc5b2183b06a6f791077f9e76d4c2c65e002d (commit)
       from aa69493a3c24a1c2d47642fdba00c5dac09138ff (commit)

commit 456dc5b2183b06a6f791077f9e76d4c2c65e002d
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Mar 6 23:42:52 2012 +0100

    Fix distcheck.

 common/Makefile.am |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 1af6ac8..b2f24b0 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,11 +1,14 @@
 noinst_LTLIBRARIES = libxfdesktop.la
 
-libxfdesktop_la_SOURCES = \
-	xfdesktop-common.c \
-	xfdesktop-common.h \
+libxfdesktop_built_sources = \
 	xfdesktop-marshal.c \
 	xfdesktop-marshal.h
 
+libxfdesktop_la_SOURCES = \
+	$(libxfdesktop_built_sources) \
+	xfdesktop-common.c \
+	xfdesktop-common.h
+
 libxfdesktop_la_CFLAGS = \
 	-I$(top_srcdir)/src \
 	$(LIBXFCE4UTIL_CFLAGS) \
@@ -25,21 +28,22 @@ libxfdesktop_la_CFLAGS += \
 endif
 endif
 
-DISTCLEANFILES = \
-	$(xfdesktop_built_sources) \
-	stamp-xfdesktop-marshal.h \
-	xfdesktop-marshal.c \
-	xfdesktop-marshal.h
+if MAINTAINER_MODE
+
+xfdesktop-marshal.h: xfdesktop-marshal.list Makefile
+	$(AM_V_GEN) glib-genmarshal --prefix=xfdesktop_marshal --internal --header $< > $@
 
-xfdesktop-marshal.h: stamp-xfdesktop-marshal.h
-	@true
-stamp-xfdesktop-marshal.h: xfdesktop-marshal.list Makefile
-	$(AM_V_GEN) glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --header > xfdesktop-marshal.h && \
-	echo timestamp > $(@F)
 xfdesktop-marshal.c: xfdesktop-marshal.list Makefile
-	$(AM_V_GEN) echo '#include "xfdesktop-marshal.h"' > xfdesktop-marshal.c && \
-	glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --body >> xfdesktop-marshal.c && \
-	glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --header > xfdesktop-marshal.h
+	$(AM_V_GEN) echo '#include "xfdesktop-marshal.h"' > $@ \
+	&& glib-genmarshal --prefix=xfdesktop_marshal --body $< >> $@
+
+DISTCLEANFILES = \
+	$(libxfdesktop_built_sources)
+
+BUILT_SOURCES = \
+	$(libxfdesktop_built_sources)
+
+endif
 
 EXTRA_DIST = \
 	xfdesktop-marshal.list