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

Jérôme Guelfucci noreply at xfce.org
Sun Apr 7 11:22:01 CEST 2013 

Updating branch refs/heads/master
         to a9997e5a7282646caeec64f5e5cfb7c58a114a10 (commit)
       from 4414371b4356f1ec281c666309b23f0a12be9eaf (commit)

commit a9997e5a7282646caeec64f5e5cfb7c58a114a10
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Apr 7 11:17:09 2013 +0200

    Tentative fix for make distcheck.
    
    This still needs some work and is not totally clean.

 Makefile.am     |   69 ++++++++++++++++++++++++++++---------------------------
 configure.ac.in |    2 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f2ebd99..747c4c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ distclean_intltool = \
 	intltool-merge \
 	intltool-update
 
-distuninstallcheck_listfiles = \ 
+distuninstallcheck_listfiles = \
 	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
 
 xfce4_notifyddir = $(HELPER_PATH_PREFIX)/xfce4/notifyd
@@ -22,21 +22,22 @@ bin_PROGRAMS = xfce4-notifyd-config/xfce4-notifyd-config
 
 xfce4_notifyd_xfce4_notifyd_SOURCES = \
 	xfce4-notifyd/main.c \
-	xfce4-notifyd/notify-dbus.h \
+	notify-dbus.h \
 	xfce4-notifyd/xfce-notify-daemon.c \
 	xfce4-notifyd/xfce-notify-daemon.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 \
+	xfce-notify-enum-types.c \
+	xfce-notify-enum-types.h \
+	xfce-notify-marshal.c \
+	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/xfce4-notifyd-config.ui.h
+	xfce4-notifyd-config.ui.h
 
 common_cflags = \
+	-I$(builddir)	\
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
@@ -104,7 +105,7 @@ zomgponiesthemedir = $(theme_dir)/ZOMG-PONIES!/xfce-notify-4.0
 dist_zomgponiestheme_DATA = themes/ZOMG-PONIES!/gtkrc
 
 built_xfce4_notifyd = \
-	xfce4-notifyd/notify-dbus.h
+	notify-dbus.h
 
 clean_xfce4_notifyd = \
 	$(built_xfce4_notifyd)
@@ -112,17 +113,17 @@ clean_xfce4_notifyd = \
 if MAINTAINER_MODE
 
 built_xfce4_notifyd += \
-	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
+	xfce-notify-marshal.c \
+	xfce-notify-marshal.h \
+	xfce-notify-enum-types.c \
+	xfce-notify-enum-types.h
 
 built_xfce4_notifyd_config = \
-	xfce4-notifyd-config/xfce4-notifyd-config.ui.h
+	xfce4-notifyd-config.ui.h
 
 clean_xfce4_notifyd += \
-	xfce4-notifyd/stamp-xfce-notify-enum-types.h \
-	xfce4-notifyd/stamp-xfce-notify-marshal.h
+	stamp-xfce-notify-enum-types.h \
+	stamp-xfce-notify-marshal.h
 
 endif
 
@@ -155,7 +156,7 @@ DISTCLEANFILES = \
 	$(distclean_intltool) \
 	$(distclean_service)
 
-xfce4-notifyd/notify-dbus.h: $(srcdir)/xfce4-notifyd/notify-dbus.xml Makefile
+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 > $@
@@ -166,44 +167,44 @@ endif
 
 if MAINTAINER_MODE
 
-xfce4-notifyd/xfce-notify-marshal.h: xfce4-notifyd/stamp-xfce-notify-marshal.h
+xfce-notify-marshal.h: stamp-xfce-notify-marshal.h
 	@true
-xfce4-notifyd/stamp-xfce-notify-marshal.h: $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list Makefile
-	@echo '/* this file is autogenerated -- do not edit */' >xfce4-notifyd/xfce-notify-marshal.h
-	@echo >>xfce4-notifyd/xfce-notify-marshal.h
-	glib-genmarshal --prefix=xfce_notify_marshal xfce4-notifyd/xfce-notify-marshal.list --header >xfce4-notifyd/xfce-notify-marshal.h
+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 >$@
-xfce4-notifyd/xfce-notify-marshal.c: $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list Makefile
+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 xfce4-notifyd/xfce-notify-marshal.list --body >>$@
+	glib-genmarshal --prefix=xfce_notify_marshal $(srcdir)/xfce4-notifyd/xfce-notify-marshal.list --body >>$@
 
-xfce4-notifyd/xfce-notify-enum-types.h: xfce4-notifyd/stamp-xfce-notify-enum-types.h
+xfce-notify-enum-types.h: stamp-xfce-notify-enum-types.h
 	@true
-xfce4-notifyd/stamp-xfce-notify-enum-types.h: xfce4-notifyd/xfce-notify-window.h Makefile
+stamp-xfce-notify-enum-types.h: $(srcdir)/xfce4-notifyd/xfce-notify-window.h Makefile
 	( 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__ */" \
-	        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 \
+	        $(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 >$@
-xfce4-notifyd/xfce-notify-enum-types.c: xfce4-notifyd/xfce-notify-window.h Makefile
+xfce-notify-enum-types.c: $(srcdir)/xfce4-notifyd/xfce-notify-window.h Makefile
 	( cd $(srcdir) && glib-mkenums \
-	        --fhead "#include \"xfce-notify-enum-types.h\"\n#include \"xfce-notify-window.h\"\n" \
+	        --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" \
-	        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
+	        $(srcdir)/xfce4-notifyd/xfce-notify-window.h ) >> xgen-xnetc \
+	&& cp xgen-xnetc xfce-notify-enum-types.c \
+	&& rm -f xgen-xnetc
 
-xfce4-notifyd-config/xfce4-notifyd-config.ui.h: $(srcdir)/xfce4-notifyd-config/xfce4-notifyd-config.glade
+xfce4-notifyd-config.ui.h: $(srcdir)/xfce4-notifyd-config/xfce4-notifyd-config.glade
 	$(EXO_CSOURCE) --static --name=xfce4_notifyd_config_ui $< >$@
 
 endif
diff --git a/configure.ac.in b/configure.ac.in
index a4f32d8..101e334 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -25,7 +25,7 @@ AC_CONFIG_HEADERS([config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl init automake
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip subdir-objects])
 AM_MAINTAINER_MODE()
 
 dnl set helper path prefix

More information about the Xfce4-commits mailing list