[Goodies-commits] r6890 - in xfce4-notes-plugin/trunk: . panel-plugin
Mike Massonnet
mmassonnet at xfce.org
Fri Mar 13 11:28:27 CET 2009
Author: mmassonnet
Date: 2009-03-13 10:28:27 +0000 (Fri, 13 Mar 2009)
New Revision: 6890
Modified:
xfce4-notes-plugin/trunk/ChangeLog
xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
Log:
Minor autofoo changes for Vala sources
Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog 2009-03-13 09:52:04 UTC (rev 6889)
+++ xfce4-notes-plugin/trunk/ChangeLog 2009-03-13 10:28:27 UTC (rev 6890)
@@ -1,3 +1,12 @@
+2009-03-13 Mike Massonnet <mmassonnet at xfce.org>
+
+Minor autofoo changes for Vala sources
+ * configure.in.in:
+ - Print a minimum requirement for valac in the build configuration
+ summary
+ * panel-plugin/Makefile.am:
+ - Unify Vala sources
+
2009-03-11 Mike Massonnet <mmassonnet at xfce.org>
Include first Vala prototype of Xfce.HypertextView
Modified: xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/Makefile.am 2009-03-13 09:52:04 UTC (rev 6889)
+++ xfce4-notes-plugin/trunk/panel-plugin/Makefile.am 2009-03-13 10:28:27 UTC (rev 6890)
@@ -1,3 +1,6 @@
+#
+# Popup program
+#
bin_PROGRAMS = xfce4-popup-notes
xfce4_popup_notes_SOURCES = \
@@ -13,15 +16,26 @@
@LIBX11_LIBS@ \
@GTK_LIBS@
+#
+# Vala sources
+#
if MAINTAINER_MODE
-BUILT_SOURCES = \
- hypertextview.c \
- hypertextview.h
+xfce4_notes_plugin_VALASOURCES = \
+ hypertextview.vala
-hypertextview.c: hypertextview.vala Makefile
- $(VALAC) --pkg=gtk+-2.0 hypertextview.vala -C
+vala_built_SOURCES = \
+ $(xfce4_notes_plugin_VALASOURCES:.vala=.c) \
+ $(xfce4_notes_plugin_VALASOURCES:.vala=.h)
+
+BUILT_SOURCES = vala.stamp
+vala.stamp: $(xfce4_notes_plugin_VALASOURCES)
+ $(VALAC) --pkg=gtk+-2.0 $^ -C
+ touch $@
endif
+#
+# Plugin
+#
plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-notes-plugin
@@ -31,13 +45,12 @@
xfce-arrow-button.h \
color.c \
color.h \
- hypertextview.c \
- hypertextview.h \
panel-plugin.c \
settings-dialog.c \
settings-dialog.h \
notes.c \
notes.h
+xfce4_notes_plugin_SOURCES += $(vala_built_SOURCES)
xfce4_notes_plugin_CFLAGS = \
-I$(top_srcdir) \
@@ -55,6 +68,9 @@
@THUNAR_VFS_LIBS@ \
@XFCONF_LIBS@
+#
+# Plugin desktop file
+#
desktop_in_in_files = xfce4-notes-plugin.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
@@ -62,13 +78,16 @@
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+%.desktop.in: %.desktop.in.in
+ sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+ $< > $@
+
+#
+# Extra
+#
EXTRA_DIST = \
- $(desktop_in_in_files) hypertextview.vala
+ $(desktop_in_in_files) $(xfce4_notes_plugin_VALASOURCES)
DISTCLEANFILES = \
- $(desktop_DATA) $(desktop_in_files) $(BUILT_SOURCES)
+ $(desktop_DATA) $(desktop_in_files) $(BUILT_SOURCES) $(vala_built_SOURCES)
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
- sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
- $< > $@
More information about the Goodies-commits
mailing list