[Xfce4-commits] <xfce4-notes-plugin:master> Make distcheck happy

[Mike Massonnet]

Updating branch refs/heads/master
         to aaa8ec4375da9972edc01004a9f5bce7a4b1f122 (commit)
       from 926b62ca4e2a1208198246a36053bf4bbc93fe6c (commit)

commit aaa8ec4375da9972edc01004a9f5bce7a4b1f122
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Wed Dec 23 18:17:15 2009 +0100

    Make distcheck happy

 ChangeLog       |    6 ++++++
 configure.ac.in |    2 +-
 lib/Makefile.am |    3 +++
 src/Makefile.am |   42 ++++++++++++++++++++++++++++++++++++------
 4 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2f5cfe..8666a1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-23  Mike Massonnet <mmassonnet at xfce.org>
 
+Make distcheck happy
+
+no-comments.
+
+2009-12-23  Mike Massonnet <mmassonnet at xfce.org>
+
 Properly quit on remove
 
 The panel plugin needs to call Gtk.main_quit() either on free or simpler on
diff --git a/configure.ac.in b/configure.ac.in
index dac677f..7dd2fd1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -8,7 +8,7 @@ dnl
 
 m4_define([xfce4_notes_plugin_version_major], [1])
 m4_define([xfce4_notes_plugin_version_minor], [7])
-m4_define([xfce4_notes_plugin_version_micro], [2])
+m4_define([xfce4_notes_plugin_version_micro], [3])
 m4_define([xfce4_notes_plugin_version_nano], [])
 m4_define([xfce4_notes_plugin_version_build], [@REVISION@])
 m4_define([xfce4_notes_plugin_version_tag], [git]) # Leave empty for releases
diff --git a/lib/Makefile.am b/lib/Makefile.am
index af147db..4ceab0b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,3 +33,6 @@ libnotes_la_LIBADD =							\
 	@LIBXFCE4UTIL_LIBS@						\
 	@XFCONF_LIBS@
 
+EXTRA_DIST =								\
+	libnotes.vapi							\
+	libnotes.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a8a31e..639ac69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,8 +67,17 @@ libnotes_la_VALAFLAGS =							\
 	--pkg=libxfconf-0						\
 	--pkg=libxfce4util-1.0
 
+if MAINTAINER_MODE
+BUILT_SOURCES = main-panel-plugin-47.c main-panel-plugin.c
+main-panel-plugin-47.c: main-panel-plugin-47.vala
+	$(AM_V_GEN) $(VALAC) $(libnotes_la_VALAFLAGS) $< -C
+
+main-panel-plugin.c:
+	$(AM_V_GEN) echo "*** The build-env is configured for Xfce Panel 4.7 ***" > $@
+endif
+
 libnotes_la_SOURCES =							\
-	main-panel-plugin-47.vala
+	main-panel-plugin-47.c
 
 libnotes_la_CFLAGS =							\
 	@LIBX11_CFLAGS@							\
@@ -77,7 +86,7 @@ libnotes_la_CFLAGS =							\
 	@XFCONF_CFLAGS@
 
 libnotes_la_LIBADD =							\
-	$(top_srcdir)/lib/libnotes.la					\
+	$(top_builddir)/lib/libnotes.la					\
 	@LIBX11_LIBS@							\
 	@LIBXFCE4PANEL_LIBS@						\
 	@LIBXFCE4UTIL_LIBS@						\
@@ -98,8 +107,17 @@ xfce4_notes_plugin_VALAFLAGS =						\
 	--pkg=libxfconf-0						\
 	--pkg=libxfce4util-1.0
 
+if MAINTAINER_MODE
+BUILT_SOURCES = main-panel-plugin.c main-panel-plugin-47.c
+main-panel-plugin.c: main-panel-plugin.vala
+	$(AM_V_VALAC) $(VALAC) $(xfce4_notes_plugin_VALAFLAGS) $< -C
+
+main-panel-plugin-47.c:
+	$(AM_V_GEN) echo "*** The build-env is configured for Xfce Panel 4.4 ***" > $@
+endif
+
 xfce4_notes_plugin_SOURCES =						\
-	main-panel-plugin.vala
+	main-panel-plugin.c
 
 xfce4_notes_plugin_CFLAGS =						\
 	@LIBX11_CFLAGS@							\
@@ -108,7 +126,7 @@ xfce4_notes_plugin_CFLAGS =						\
 	@XFCONF_CFLAGS@
 
 xfce4_notes_plugin_LDADD =						\
-	$(top_srcdir)/lib/libnotes.la					\
+	$(top_builddir)/lib/libnotes.la					\
 	@LIBX11_LIBS@							\
 	@LIBXFCE4PANEL_LIBS@						\
 	@LIBXFCE4UTIL_LIBS@						\
@@ -134,9 +152,16 @@ xfce4_notes_VALAFLAGS =							\
 	--pkg=libxfconf-0						\
 	--pkg=libxfce4util-1.0
 
+if MAINTAINER_MODE
+BUILT_SOURCES += main-status-icon.c
+main-status-icon.c: main-status-icon.vala
+	$(AM_V_VALAC) $(VALAC) $(xfce4_notes_VALAFLAGS) $< -C
+endif
+
 xfce4_notes_SOURCES =							\
 	xfce-autostart.c						\
-	main-status-icon.vala
+	xfce-autostart.h						\
+	main-status-icon.c
 
 xfce4_notes_CFLAGS =							\
 	@LIBX11_CFLAGS@							\
@@ -146,7 +171,7 @@ xfce4_notes_CFLAGS =							\
 	@UNIQUE_CFLAGS@
 
 xfce4_notes_LDADD =							\
-	$(top_srcdir)/lib/libnotes.la					\
+	$(top_builddir)/lib/libnotes.la					\
 	@LIBX11_LIBS@							\
 	@GTK_LIBS@							\
 	@LIBXFCE4UTIL_LIBS@						\
@@ -195,11 +220,16 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 #
 
 EXTRA_DIST =								\
+	main-panel-plugin-47.vala					\
+	main-panel-plugin.vala						\
+	main-status-icon.vala						\
 	$(desktop_in_in_files)						\
+	$(applications_in_files)					\
 	$(autostart_in_files)
 
 DISTCLEANFILES =							\
 	$(desktop_DATA)							\
 	$(desktop_in_files)						\
+	$(applications_DATA)						\
 	$(autostart_DATA)