seahorse r2265 - in trunk: . gkr libseahorse pgp src ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Wed Jul  9 03:47:30 2008
New Revision: 2265
URL: http://svn.gnome.org/viewvc/seahorse?rev=2265&view=rev

Log:
	* src/Makefile.am:
	* gkr/Makefile.am:
	* pgp/Makefile.am:
	* ssh/Makefile.am:
	* libseahorse/Makefile.am:
	* acinclude.m4: Make seahorse build more reliably on machines 
without 
	a version of vala.



Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/gkr/Makefile.am
   trunk/libseahorse/Makefile.am
   trunk/pgp/Makefile.am
   trunk/src/Makefile.am
   trunk/ssh/Makefile.am

Modified: trunk/acinclude.m4
==============================================================================
--- trunk/acinclude.m4	(original)
+++ trunk/acinclude.m4	Wed Jul  9 03:47:30 2008
@@ -77,11 +77,11 @@
 		AC_REQUIRE([AC_PROG_AWK])
 		AC_MSG_CHECKING([valac is at least version $1])
 
-		if "${VALAC}" --version | "${AWK}" -v r='$1' 'function vn(s) { if (3 == split(s,v,".")) return (v[1]*1000+v[2])*1000+v[3]; else exit 2; } /^Vala / { exit vn(r) > vn($[2]) }'; then
+		if "${VALAC}" --version | "${AWK}" -v r='$1' 'function vn(s) { if (3 == split(s,v,".")) return (v[1]*1000+v[2])*1000+v[3]; else exit 2; } /^Vala / { exit vn(r) < vn($2) }'; then
 			AC_MSG_RESULT([yes])
 		else
 			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([Vala $1 not found.])
+			VALAC=
 		fi
 	fi
 ])

Modified: trunk/gkr/Makefile.am
==============================================================================
--- trunk/gkr/Makefile.am	(original)
+++ trunk/gkr/Makefile.am	Wed Jul  9 03:47:30 2008
@@ -63,6 +63,6 @@
 	$(VALA_CFILES) $(VALA_HFILES) \
 	$(VALA_SRCS)
 
-CLEAN_FILES = \
-	vala-build.stamp \
-	$(VALA_CFILES) $(VALA_HFILES)
+vala-clean:
+	rm -f vala-build.stamp $(VALA_CFILES) $(VALA_HFILES)
+

Modified: trunk/libseahorse/Makefile.am
==============================================================================
--- trunk/libseahorse/Makefile.am	(original)
+++ trunk/libseahorse/Makefile.am	Wed Jul  9 03:47:30 2008
@@ -106,6 +106,6 @@
 	$(VALA_CFILES) $(VALA_HFILES) \
 	seahorse-marshal.list
 
-CLEAN_FILES = \
-	vala-build.stamp \
-	$(VALA_CFILES) $(VALA_HFILES)
+vala-clean:
+	rm -f vala-build.stamp $(VALA_CFILES) $(VALA_HFILES)
+

Modified: trunk/pgp/Makefile.am
==============================================================================
--- trunk/pgp/Makefile.am	(original)
+++ trunk/pgp/Makefile.am	Wed Jul  9 03:47:30 2008
@@ -113,6 +113,6 @@
 	$(VALA_CFILES) $(VALA_HFILES) \
 	$(VALA_SRCS)
 
-CLEAN_FILES = \
-	vala-build.stamp \
-	$(VALA_CFILES) $(VALA_HFILES)
+vala-clean:
+	rm -f vala-build.stamp $(VALA_CFILES) $(VALA_HFILES)
+

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Jul  9 03:47:30 2008
@@ -90,6 +90,8 @@
 
 CLEANFILES = *.gladep* *.bak \
     $(desktop_DATA) \
-    $(VALA_CFILES) $(VALA_HFILES) \
-    vala-build.stamp \
     seahorse.desktop.in 
+
+vala-clean:
+	rm -f vala-build.stamp $(VALA_CFILES) $(VALA_HFILES)
+

Modified: trunk/ssh/Makefile.am
==============================================================================
--- trunk/ssh/Makefile.am	(original)
+++ trunk/ssh/Makefile.am	Wed Jul  9 03:47:30 2008
@@ -78,7 +78,6 @@
 	$(VALA_CFILES) $(VALA_HFILES) \
 	$(VALA_SRCS)
 
-CLEAN_FILES = \
-	vala-build.stamp \
-	$(VALA_CFILES) $(VALA_HFILES)
-	
\ No newline at end of file
+vala-clean:
+	rm -f vala-build.stamp $(VALA_CFILES) $(VALA_HFILES)
+