[Goodies-commits] r7611 - in xfce4-notes-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2009-06-18 20:32:32 +0000 (Thu, 18 Jun 2009)
New Revision: 7611

Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/Makefile.am
   xfce4-notes-plugin/trunk/configure.in.in
   xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
Log:
Clean up over autotools scripts

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-06-18 17:30:02 UTC (rev 7610)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-06-18 20:32:32 UTC (rev 7611)
@@ -1,5 +1,12 @@
 2009-06-16  Mike Massonnet <mmassonnet at xfce.org>
 
+Clean up over autotools scripts
+	* panel-plugin/Makefile.am:
+	  - Fix broken distdir (once once again but this time for sure).
+	  - Fix clean rule on maintainer-mode only.
+
+2009-06-16  Mike Massonnet <mmassonnet at xfce.org>
+
 Fix make distcheck (once again)
 
 2009-06-15  Mike Massonnet <mmassonnet at xfce.org>

Modified: xfce4-notes-plugin/trunk/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/Makefile.am	2009-06-18 17:30:02 UTC (rev 7610)
+++ xfce4-notes-plugin/trunk/Makefile.am	2009-06-18 20:32:32 UTC (rev 7611)
@@ -8,9 +8,6 @@
 distclean-local:
 	rm -rf *.cache *~
 
-DISTCHECK_CONFIGURE_FLAGS =						\
-	--enable-maintainer-mode
-
 EXTRA_DIST =								\
 	AUTHORS								\
 	ChangeLog							\

Modified: xfce4-notes-plugin/trunk/configure.in.in
===================================================================
--- xfce4-notes-plugin/trunk/configure.in.in	2009-06-18 17:30:02 UTC (rev 7610)
+++ xfce4-notes-plugin/trunk/configure.in.in	2009-06-18 20:32:32 UTC (rev 7611)
@@ -14,8 +14,11 @@
 m4_define([xfce4_notes_plugin_version_tag], [svn]) # Leave empty for releases
 m4_define([xfce4_notes_plugin_version], [xfce4_notes_plugin_version_major().xfce4_notes_plugin_version_minor().xfce4_notes_plugin_version_micro()ifelse(xfce4_notes_plugin_version_nano(), [], [], [.xfce4_notes_plugin_version_nano()])ifelse(xfce4_notes_plugin_version_tag(), [svn], [xfce4_notes_plugin_version_tag()-xfce4_notes_plugin_version_build()], [xfce4_notes_plugin_version_tag()])])
 
+AC_PREREQ([2.50])
 AC_INIT([xfce4-notes-plugin], [xfce4_notes_plugin_version], 
         [mmassonnet at xfce.org])
+AC_REVISION([project_version_build])
+AC_CANONICAL_TARGET()
 
 AM_INIT_AUTOMAKE([1.8 dist-bzip2])
 AM_CONFIG_HEADER([config.h])
@@ -27,11 +30,6 @@
 m4_undefine([AC_PROG_F77])
 m4_defun([AC_PROG_F77],[])
 
-dnl Check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-
 dnl Check for basic programs
 AC_PROG_CC_C_O
 AC_PROG_LD

Modified: xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-06-18 17:30:02 UTC (rev 7610)
+++ xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-06-18 20:32:32 UTC (rev 7611)
@@ -6,6 +6,7 @@
 #
 # Popup program
 #
+
 bin_PROGRAMS = xfce4-popup-notes
 
 xfce4_popup_notes_SOURCES =						\
@@ -23,6 +24,7 @@
 #
 # Settings dialog
 #
+
 bin_PROGRAMS += xfce4-notes-settings
 
 xfce4_notes_settings_SOURCES =						\
@@ -44,24 +46,31 @@
 #
 # Vala sources
 #
-if MAINTAINER_MODE
-xfce4_notes_plugin_VALASOURCES =					\
+
+notes_VAPISOURCES =							\
+	config.vapi							\
+	color.vapi							\
+	popup.vapi
+
+notes_VALASOURCES =							\
 	hypertextview.vala						\
 	note.vala							\
 	window.vala							\
 	application.vala						\
 	main.vala
 
-vala_built_SOURCES = $(xfce4_notes_plugin_VALASOURCES:.vala=.c)
-BUILT_SOURCES = vala.stamp
+notes_VALABUILTSOURCES = $(notes_VALASOURCES:.vala=.c)
 
+if MAINTAINER_MODE
 if HAVE_LIBXFCE4PANEL47
 DEFINES=-D HAVE_LIBXFCE4PANEL47
 PACKAGES=--pkg=libxfcegui4-1.0 --pkg=libxfce4panel-1.0
 else
 PACKAGES=--pkg=libxfce4panel-1.0
 endif
-vala.stamp: $(xfce4_notes_plugin_VALASOURCES)
+BUILT_SOURCES = vala.stamp
+$(notes_VALABUILTSOURCES): vala.stamp
+vala.stamp: $(notes_VALASOURCES)
 	$(VALAC) $(DEFINES) --vapidir=$(srcdir) --pkg=config --pkg=color --pkg=popup --pkg=libxfconf-0 $(PACKAGES) $^ -C
 	touch $@
 endif
@@ -69,6 +78,7 @@
 #
 # Plugin
 #
+
 if HAVE_LIBXFCE4PANEL47
 
 plugindir = $(libdir)/xfce4/panel-plugins
@@ -79,7 +89,7 @@
 	color.h								\
 	popup.c								\
 	popup.h								\
-	$(vala_built_SOURCES)
+	$(notes_VALABUILTSOURCES)
 
 libnotes_la_CFLAGS =							\
 	@LIBXFCE4PANEL_CFLAGS@						\
@@ -103,7 +113,7 @@
 	color.h								\
 	popup.c								\
 	popup.h								\
-	$(vala_built_SOURCES)
+	$(notes_VALABUILTSOURCES)
 
 xfce4_notes_plugin_CFLAGS =						\
 	@LIBXFCE4PANEL_CFLAGS@						\
@@ -122,6 +132,7 @@
 #
 # Plugin desktop file
 #
+
 desktop_in_in_files =							\
 	xfce4-notes-plugin-47.desktop.in.in				\
 	xfce4-notes-plugin.desktop.in.in
@@ -142,13 +153,19 @@
 #
 # Extra
 #
+
 EXTRA_DIST =								\
-	$(desktop_in_in_files) $(xfce4_notes_plugin_VALASOURCES)	\
-	config.vapi color.vapi popup.vapi
+	$(notes_VAPISOURCES)						\
+	$(notes_VALASOURCES)						\
+	$(desktop_in_in_files)
 
+if MAINTAINER_MODE
 CLEANFILES =								\
-	$(BUILT_SOURCES) $(vala_built_SOURCES)
+	$(BUILT_SOURCES)						\
+	$(notes_VALABUILTSOURCES)
+endif
 
 DISTCLEANFILES =							\
-	$(desktop_DATA) $(desktop_in_files)
+	$(desktop_DATA)							\
+	$(desktop_in_files)