[Xfce4-commits] <xfce4-notifyd:master> Properly fix make distcheck.

Jérôme Guelfucci noreply at xfce.org
Sun Apr 14 15:46:01 CEST 2013


Updating branch refs/heads/master
         to 090e1b708940bb5cc76dc857a786dfff949d6550 (commit)
       from 1b1b2a62e3199abf075b33615ccc073a1e3b1fd3 (commit)

commit 090e1b708940bb5cc76dc857a786dfff949d6550
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Apr 14 15:44:39 2013 +0200

    Properly fix make distcheck.
    
    Also add AM_V_GEN calls to clean the build log.

 Makefile.am |  105 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4ca28f1..0d47598 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,19 +22,19 @@ bin_PROGRAMS = xfce4-notifyd-config/xfce4-notifyd-config
 
 xfce4_notifyd_xfce4_notifyd_SOURCES = \
 	xfce4-notifyd/main.c \
-	notify-dbus.h \
+	xfce4-notifyd/notify-dbus.h \
 	xfce4-notifyd/xfce-notify-daemon.c \
 	xfce4-notifyd/xfce-notify-daemon.h \
-	xfce-notify-enum-types.c \
-	xfce-notify-enum-types.h \
-	xfce-notify-marshal.c \
-	xfce-notify-marshal.h \
+	xfce4-notifyd/xfce-notify-enum-types.c \
+	xfce4-notifyd/xfce-notify-enum-types.h \
+	xfce4-notifyd/xfce-notify-marshal.c \
+	xfce4-notifyd/xfce-notify-marshal.h \
 	xfce4-notifyd/xfce-notify-window.c \
 	xfce4-notifyd/xfce-notify-window.h
 
 xfce4_notifyd_config_xfce4_notifyd_config_SOURCES = \
 	xfce4-notifyd-config/main.c \
-	xfce4-notifyd-config.ui.h
+	xfce4-notifyd-config/xfce4-notifyd-config.ui.h
 
 common_cflags = \
 	-I$(builddir)	\
@@ -107,7 +107,7 @@ zomgponiesthemedir = $(theme_dir)/ZOMG-PONIES!/xfce-notify-4.0
 dist_zomgponiestheme_DATA = themes/ZOMG-PONIES!/gtkrc
 
 built_xfce4_notifyd = \
-	notify-dbus.h
+	xfce4-notifyd/notify-dbus.h
 
 clean_xfce4_notifyd = \
 	$(built_xfce4_notifyd)
@@ -115,17 +115,17 @@ clean_xfce4_notifyd = \
 if MAINTAINER_MODE
 
 built_xfce4_notifyd += \
-	xfce-notify-marshal.c \
-	xfce-notify-marshal.h \
-	xfce-notify-enum-types.c \
-	xfce-notify-enum-types.h
+	xfce4-notifyd/xfce-notify-marshal.c \
+	xfce4-notifyd/xfce-notify-marshal.h \
+	xfce4-notifyd/xfce-notify-enum-types.c \
+	xfce4-notifyd/xfce-notify-enum-types.h
 
 built_xfce4_notifyd_config = \
-	xfce4-notifyd-config.ui.h
+	xfce4-notifyd-config/xfce4-notifyd-config.ui.h
 
 clean_xfce4_notifyd += \
-	stamp-xfce-notify-enum-types.h \
-	stamp-xfce-notify-marshal.h
+	xfce4-notifyd/stamp-xfce-notify-enum-types.h \
+	xfce4-notifyd/stamp-xfce-notify-marshal.h
 
 endif
 
@@ -158,56 +158,71 @@ DISTCLEANFILES = \
 	$(distclean_intltool) \
 	$(distclean_service)
 
-notify-dbus.h: $(srcdir)/xfce4-notifyd/notify-dbus.xml Makefile
+xfce4-notifyd/notify-dbus.h: $(srcdir)/xfce4-notifyd/notify-dbus.xml Makefile
 if USE_OLD_GET_SERVER_INFORMATION_SIGNATURE
-	sed -e 's,<arg direction="out" name="spec_version" type="s"/>,,' $< > $(<F).tmp
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=notify $(<F).tmp > $@
-	rm -f $(<F).tmp
+	$(AM_V_GEN) (\
+	sed -e 's,<arg direction="out" name="spec_version" type="s"/>,,' $< > $(<F).tmp \
+	&& $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=notify $(<F).tmp > $@ \
+	&& rm -f $(<F).tmp \
+	)
 else
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=notify $< > $@
+	$(AM_V_GEN) (\
+	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=notify $< > $@ \
+	)
 endif
 
 if MAINTAINER_MODE
 
-xfce-notify-marshal.h: stamp-xfce-notify-marshal.h
+xfce4-notifyd/xfce-notify-marshal.h: xfce4-notifyd/stamp-xfce-notify-marshal.h
 	@true
-stamp-xfce-notify-marshal.h: $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list Makefile
-	@echo '/* this file is autogenerated -- do not edit */' > xfce-notify-marshal.h
-	@echo >> xfce-notify-marshal.h
-	glib-genmarshal --prefix=xfce_notify_marshal $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list --header >> xfce-notify-marshal.h
-	echo timestamp >$@
-xfce-notify-marshal.c: $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list Makefile
-	@echo '/* this file is autogenerated -- do not edit */' >$@
-	@echo >>$@
-	@echo '#include "xfce-notify-marshal.h"' >$@
-	@echo >>$@
-	glib-genmarshal --prefix=xfce_notify_marshal $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list --body >>$@
-
-xfce-notify-enum-types.h: stamp-xfce-notify-enum-types.h
+
+xfce4-notifyd/stamp-xfce-notify-marshal.h: $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list Makefile
+	$(AM_V_GEN) ( \
+	echo '/* this file is autogenerated -- do not edit */' > xfce4-notifyd/xfce-notify-marshal.h \
+  && glib-genmarshal --prefix=xfce_notify_marshal --header $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list \
+  >> xfce4-notifyd/xfce-notify-marshal.h \
+	&& echo timestamp >$@ )
+
+xfce4-notifyd/xfce-notify-marshal.c: $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list Makefile
+	$(AM_V_GEN) ( \
+	echo '/* this file is autogenerated -- do not edit */' >$@ \
+	&& echo '#include "xfce-notify-marshal.h"' >$@ \
+	&& glib-genmarshal --prefix=xfce_notify_marshal --body $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list >>$@ \
+	)
+
+xfce4-notifyd/xfce-notify-enum-types.h: $(srcdir)/xfce4-notifyd/stamp-xfce-notify-enum-types.h
 	@true
-stamp-xfce-notify-enum-types.h: $(srcdir)/xfce4-notifyd/xfce-notify-window.h Makefile
+
+xfce4-notifyd/stamp-xfce-notify-enum-types.h: $(srcdir)/xfce4-notifyd/xfce-notify-window.h Makefile
+	$(AM_V_GEN) ( \
 	( cd $(srcdir) && glib-mkenums \
 	        --fhead "#ifndef __XFCE_NOTIFY_ENUM_TYPES_H__\n#define __XFCE_NOTIFY_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \
 	        --fprod "/* enumerations from \"@filename@\" */\n" \
 	        --vhead "GType @enum_name at _get_type(void) G_GNUC_CONST;\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
 	        --ftail "G_END_DECLS\n\n#endif /* __XFCE_NOTIFY_ENUM_TYPES_H__ */" \
-	        $(srcdir)/xfce4-notifyd/xfce-notify-window.h ) >> xgen-xneth \
-	&& ( cmp -s xgen-xneth xfce-notify-enum-types.h || cp xgen-xneth xfce-notify-enum-types.h ) \
-	&& rm -f xgen-xneth \
-	&& echo timestamp >$@
-xfce-notify-enum-types.c: $(srcdir)/xfce4-notifyd/xfce-notify-window.h Makefile
+	        $(srcdir)/xfce4-notifyd/xfce-notify-window.h ) >> xfce4-notifyd/xgen-xneth \
+	&& ( cmp -s xfce4-notifyd/xgen-xneth xfce4-notifyd/xfce-notify-enum-types.h || cp xfce4-notifyd/xgen-xneth xfce4-notifyd/xfce-notify-enum-types.h ) \
+	&& rm -f xfce4-notifyd/xgen-xneth \
+	&& echo timestamp >$@ \
+	)
+
+xfce4-notifyd/xfce-notify-enum-types.c: $(srcdir)/xfce4-notifyd/xfce-notify-window.h Makefile
+	$(AM_V_GEN) ( \
 	( cd $(srcdir) && glib-mkenums \
 	        --fhead "#include \"xfce-notify-enum-types.h\"\n#include \"xfce4-notifyd/xfce-notify-window.h\"\n" \
 	        --fprod "\n/* enumerations from \"@filename@\" */" \
 	        --vhead "GType\n at enum_name@_get_type(void)\n{\n\tstatic GType type = 0;\n\tif(type == 0) {\n\tstatic const G at Type@Value values[] = {"\
 	        --vprod "\t{ @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 	        --vtail "\t{ 0, NULL, NULL }\n\t};\n\ttype = g_ at type@_register_static(\"@EnumName@\", values);\n  }\n\treturn type;\n}\n" \
-	        $(srcdir)/xfce4-notifyd/xfce-notify-window.h ) >> xgen-xnetc \
-	&& cp xgen-xnetc xfce-notify-enum-types.c \
-	&& rm -f xgen-xnetc
-
-xfce4-notifyd-config.ui.h: $(srcdir)/xfce4-notifyd-config/xfce4-notifyd-config.glade
-	$(EXO_CSOURCE) --static --name=xfce4_notifyd_config_ui $< >$@
+	        $(srcdir)/xfce4-notifyd/xfce-notify-window.h ) >> xfce4-notifyd/xgen-xnetc \
+	&& cp xfce4-notifyd/xgen-xnetc xfce4-notifyd/xfce-notify-enum-types.c \
+	&& rm -f xfce4-notifyd/xgen-xnetc \
+	)
+
+xfce4-notifyd-config/xfce4-notifyd-config.ui.h: $(srcdir)/xfce4-notifyd-config/xfce4-notifyd-config.glade
+	$(AM_V_GEN) ( \
+	$(EXO_CSOURCE) --static --name=xfce4_notifyd_config_ui $< >$@ \
+	)
 
 endif
 


More information about the Xfce4-commits mailing list