Compilation fixes for automake-1.8 and mono beta 1



Hey guys,

This is just a quick patch that I needed to get current CVS compiling with the config above. Very simple, against anoncvs.

Automake 1.8 has issues with SOURCES.

--
Cheers

Koz
Index: backends/GaimLogBackend.cs
===================================================================
RCS file: /cvs/gnome/dashboard/backends/GaimLogBackend.cs,v
retrieving revision 1.43
diff -u -p -u -r1.43 GaimLogBackend.cs
--- a/backends/GaimLogBackend.cs	27 Apr 2004 23:29:31 -0000	1.43
+++ b/backends/GaimLogBackend.cs	5 May 2004 06:59:45 -0000
@@ -248,7 +248,7 @@ namespace Dashboard {
 
 		private StreamReader sr;
 
-		public LogStreamReader (Stream s) {
+		public LogStreamReader (Stream s) : base(s) {
 			sr = new StreamReader (s);
 			Offset = s.Position;
 		}
Index: util/evolution/Makefile.am
===================================================================
RCS file: /cvs/gnome/dashboard/util/evolution/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- a/util/evolution/Makefile.am	5 Dec 2003 09:21:07 -0000	1.3
+++ b/util/evolution/Makefile.am	5 May 2004 06:59:46 -0000
@@ -1,7 +1,7 @@
 CSC=mcs -g
 LIBFLAGS=-target:library -r:glib-sharp.dll -r:gdk-sharp.dll -r:gtk-sharp.dll -r:gnome-sharp.dll
 
-SOURCES = \
+SOURCE_FILES = \
 	$(srcdir)/camel.cs
 
 DLL = \
@@ -9,8 +9,8 @@ DLL = \
 
 all: $(DLL)
 
-$(DLL): $(SOURCES)
-	$(CSC) $(LIBFLAGS) -out:evolution.dll $(SOURCES)
+$(DLL): $(SOURCE_FILES)
+	$(CSC) $(LIBFLAGS) -out:evolution.dll $(SOURCE_FILES)
 	cp $(DLL) ../../engine # kludge
 
 dashboardlibdir = $(prefix)/lib/dashboard
@@ -22,4 +22,4 @@ install-data-local: $(DLL)
 clean:
 	rm -f *.dll *.exe
 
-EXTRA_DIST = $(SOURCES)
+EXTRA_DIST = $(SOURCE_FILES)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]