[cig-commits] r6953 - in cs/babel/trunk: . elsa elsa/ast elsa/elkhound elsa/elkhound/c elsa/elkhound/examples/arith elsa/elsa elsa/smbase

leif at geodynamics.org leif at geodynamics.org
Thu May 24 07:28:00 PDT 2007 

Author: leif
Date: 2007-05-24 07:27:53 -0700 (Thu, 24 May 2007)
New Revision: 6953

Added:
   cs/babel/trunk/elsa/Makefile.am
Removed:
   cs/babel/trunk/elsa/Makefile
Modified:
   cs/babel/trunk/Makefile.am
   cs/babel/trunk/configure.ac
   cs/babel/trunk/elsa/ast/
   cs/babel/trunk/elsa/ast/configure.pl
   cs/babel/trunk/elsa/elkhound/
   cs/babel/trunk/elsa/elkhound/c/
   cs/babel/trunk/elsa/elkhound/c/configure.pl
   cs/babel/trunk/elsa/elkhound/configure.pl
   cs/babel/trunk/elsa/elkhound/examples/arith/
   cs/babel/trunk/elsa/elkhound/examples/arith/configure.pl
   cs/babel/trunk/elsa/elsa/
   cs/babel/trunk/elsa/elsa/configure.pl
   cs/babel/trunk/elsa/smbase/
   cs/babel/trunk/elsa/smbase/configure.pl
Log:
Incorporated the Elsa build into the GNU build.  For now, I'm using
the strategy that involves the least amount of effort.  See section
23.2 of the Automake manual ("Third-Party Makefiles").


Modified: cs/babel/trunk/Makefile.am
===================================================================
--- cs/babel/trunk/Makefile.am	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/Makefile.am	2007-05-24 14:27:53 UTC (rev 6953)
@@ -2,7 +2,7 @@
 
 
 ACLOCAL_AMFLAGS = -I ./m4
-SUBDIRS = spike
+SUBDIRS = elsa spike
 
 
 bin_PROGRAMS = pyspike

Modified: cs/babel/trunk/configure.ac
===================================================================
--- cs/babel/trunk/configure.ac	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/configure.ac	2007-05-24 14:27:53 UTC (rev 6953)
@@ -5,7 +5,7 @@
 AC_PREREQ(2.59)
 AC_INIT([babel], [0.1.0], [cig-cs at geodynamics.org], [babel])
 AC_CONFIG_AUX_DIR([./aux-config])
-AC_CONFIG_SRCDIR([spike/spikec.py])
+AC_CONFIG_SRCDIR([babel.cc])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -18,6 +18,7 @@
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_LEX
 AC_PROG_YACC
 dnl AC_PROG_LIBTOOL
@@ -28,8 +29,12 @@
 
 # Checks for library functions.
 
-AC_CONFIG_FILES([Makefile spike/Makefile])
+AC_CONFIG_FILES([Makefile
+                 elsa/Makefile
+                 spike/Makefile])
 
+AC_CONFIG_SUBDIRS([elsa])
+
 AC_OUTPUT
 
 dnl end of configure.ac

Deleted: cs/babel/trunk/elsa/Makefile
===================================================================
--- cs/babel/trunk/elsa/Makefile	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/Makefile	2007-05-24 14:27:53 UTC (rev 6953)
@@ -1,32 +0,0 @@
-# Makefile for toplevel elsa distribution
-
-# just do the obvious recursive thing
-all:
-	$(MAKE) -C smbase
-	$(MAKE) -C ast
-	$(MAKE) -C elkhound
-	$(MAKE) -C elsa
-
-check:
-	$(MAKE) -C smbase check
-	$(MAKE) -C ast check
-	$(MAKE) -C elkhound check
-	$(MAKE) -C elsa check
-
-clean:
-	$(MAKE) -C smbase clean
-	$(MAKE) -C ast clean
-	$(MAKE) -C elkhound clean
-	$(MAKE) -C elsa clean
-
-distclean:
-	$(MAKE) -C smbase distclean
-	$(MAKE) -C ast distclean
-	$(MAKE) -C elkhound distclean
-	$(MAKE) -C elsa distclean
-
-doc:
-	$(MAKE) -C smbase doc
-	$(MAKE) -C ast doc
-	$(MAKE) -C elkhound doc
-	$(MAKE) -C elsa doc

Copied: cs/babel/trunk/elsa/Makefile.am (from rev 6952, cs/babel/trunk/elsa/Makefile)
===================================================================
--- cs/babel/trunk/elsa/Makefile	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/Makefile.am	2007-05-24 14:27:53 UTC (rev 6953)
@@ -0,0 +1,33 @@
+## Process this file with automake to produce Makefile.in
+# Makefile for toplevel elsa distribution
+
+# just do the obvious recursive thing
+all-local:
+	cd smbase    && $(MAKE) $(AM_MAKEFLAGS) all
+	cd ast       && $(MAKE) $(AM_MAKEFLAGS) all
+	cd elkhound  && $(MAKE) $(AM_MAKEFLAGS) all
+	cd elsa      && $(MAKE) $(AM_MAKEFLAGS) all
+
+check-local:
+	cd smbase    && $(MAKE) $(AM_MAKEFLAGS) check
+	cd ast       && $(MAKE) $(AM_MAKEFLAGS) check
+	cd elkhound  && $(MAKE) $(AM_MAKEFLAGS) check
+	cd elsa      && $(MAKE) $(AM_MAKEFLAGS) check
+
+clean-local:
+	cd smbase    && $(MAKE) $(AM_MAKEFLAGS) clean
+	cd ast       && $(MAKE) $(AM_MAKEFLAGS) clean
+	cd elkhound  && $(MAKE) $(AM_MAKEFLAGS) clean
+	cd elsa      && $(MAKE) $(AM_MAKEFLAGS) clean
+
+distclean-local:
+	cd smbase    && $(MAKE) $(AM_MAKEFLAGS) distclean
+	cd ast       && $(MAKE) $(AM_MAKEFLAGS) distclean
+	cd elkhound  && $(MAKE) $(AM_MAKEFLAGS) distclean
+	cd elsa      && $(MAKE) $(AM_MAKEFLAGS) distclean
+
+doc:
+	cd smbase    && $(MAKE) $(AM_MAKEFLAGS) doc
+	cd ast       && $(MAKE) $(AM_MAKEFLAGS) doc
+	cd elkhound  && $(MAKE) $(AM_MAKEFLAGS) doc
+	cd elsa      && $(MAKE) $(AM_MAKEFLAGS) doc


Property changes on: cs/babel/trunk/elsa/ast
___________________________________________________________________
Name: svn:ignore
   + *.d


Modified: cs/babel/trunk/elsa/ast/configure.pl
===================================================================
--- cs/babel/trunk/elsa/ast/configure.pl	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/ast/configure.pl	2007-05-24 14:27:53 UTC (rev 6953)
@@ -80,7 +80,8 @@
   }
 
   else {
-    die "unknown option: $arg\n";
+    ## lcs: ignore for GNU build
+    #die "unknown option: $arg\n";
   }
 }
 


Property changes on: cs/babel/trunk/elsa/elkhound
___________________________________________________________________
Name: svn:ignore
   + *.d



Property changes on: cs/babel/trunk/elsa/elkhound/c
___________________________________________________________________
Name: svn:ignore
   + *.d


Modified: cs/babel/trunk/elsa/elkhound/c/configure.pl
===================================================================
--- cs/babel/trunk/elsa/elkhound/c/configure.pl	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/elkhound/c/configure.pl	2007-05-24 14:27:53 UTC (rev 6953)
@@ -84,7 +84,8 @@
   }
 
   else {
-    die "unknown option: $arg\n";
+    ## lcs: ignore for GNU build
+    #die "unknown option: $arg\n";
   }
 }
 

Modified: cs/babel/trunk/elsa/elkhound/configure.pl
===================================================================
--- cs/babel/trunk/elsa/elkhound/configure.pl	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/elkhound/configure.pl	2007-05-24 14:27:53 UTC (rev 6953)
@@ -192,7 +192,8 @@
   }
 
   else {
-    die "unknown option: $arg\n";
+    ## lcs: ignore for GNU build
+    #die "unknown option: $arg\n";
   }
 }
 


Property changes on: cs/babel/trunk/elsa/elkhound/examples/arith
___________________________________________________________________
Name: svn:ignore
   + *.d


Modified: cs/babel/trunk/elsa/elkhound/examples/arith/configure.pl
===================================================================
--- cs/babel/trunk/elsa/elkhound/examples/arith/configure.pl	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/elkhound/examples/arith/configure.pl	2007-05-24 14:27:53 UTC (rev 6953)
@@ -84,7 +84,8 @@
   }
 
   else {
-    die "unknown option: $arg\n";
+    ## lcs: ignore for GNU build
+    #die "unknown option: $arg\n";
   }
 }
 


Property changes on: cs/babel/trunk/elsa/elsa
___________________________________________________________________
Name: svn:ignore
   + *.d


Modified: cs/babel/trunk/elsa/elsa/configure.pl
===================================================================
--- cs/babel/trunk/elsa/elsa/configure.pl	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/elsa/configure.pl	2007-05-24 14:27:53 UTC (rev 6953)
@@ -117,7 +117,8 @@
   }
 
   else {
-    die "unknown option: $arg\n";
+    ## lcs: ignore for GNU build
+    #die "unknown option: $arg\n";
   }
 }
 


Property changes on: cs/babel/trunk/elsa/smbase
___________________________________________________________________
Name: svn:ignore
   + *.d


Modified: cs/babel/trunk/elsa/smbase/configure.pl
===================================================================
--- cs/babel/trunk/elsa/smbase/configure.pl	2007-05-24 13:52:12 UTC (rev 6952)
+++ cs/babel/trunk/elsa/smbase/configure.pl	2007-05-24 14:27:53 UTC (rev 6953)
@@ -82,8 +82,9 @@
   }
   
   else {
-    print STDERR ("unknown option: $arg\n");
-    exit(2);
+    ## lcs: ignore for GNU build
+    #print STDERR ("unknown option: $arg\n");
+    #exit(2);
   }
 }

More information about the cig-commits mailing list