Changes in / [c23f807:69911c11]

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Makefile.in (modified) (1 diff)
• src/driver/Makefile.in (modified) (1 diff)
• src/examples/Makefile.in (modified) (1 diff)
• src/libcfa/Makefile.am (modified) (2 diffs)
• src/libcfa/Makefile.in (modified) (2 diffs)
• src/main.cc (modified) (4 diffs)

configure

@@ -2999 +2999 @@
         cfa_incdir="${cfa_prefix}/include"
 else
-        cfa_incdir=${includedir}
+        cfa_incdir=${$includedir}
 fi
 

configure.ac

@@ -41 +41 @@
         cfa_incdir="${cfa_prefix}/include"
 else
-        cfa_incdir=${includedir}
+        cfa_incdir=${$includedir}
 fi 
 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])

src/Makefile.in

@@ -413 +413 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
         $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --foreign src/Makefile
+          $(AUTOMAKE) --gnu src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

src/driver/Makefile.in

@@ -195 +195 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/driver/Makefile'; \
         $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --foreign src/driver/Makefile
+          $(AUTOMAKE) --gnu src/driver/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

src/examples/Makefile.in

@@ -191 +191 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \
         $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --foreign src/examples/Makefile
+          $(AUTOMAKE) --gnu src/examples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Dec 16 22:58:17 2015
-## Update Count     : 9
+## Last Modified On : Thu Jun  4 22:49:16 2015
+## Update Count     : 7
 ###############################################################################
 
@@ -44 +44 @@
 
 libcfa-prelude.c : ${srcdir}/prelude.cf
-        ../cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${libdir}/cfa-cpp -l ${srcdir}/prelude.cf $@
 
 libcfa-prelude.o : libcfa-prelude.c

src/libcfa/Makefile.in

@@ -220 +220 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcfa/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcfa/Makefile'; \
         $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --foreign src/libcfa/Makefile
+          $(AUTOMAKE) --gnu src/libcfa/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -542 +542 @@
 
 libcfa-prelude.c : ${srcdir}/prelude.cf
-        ../cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${libdir}/cfa-cpp -l ${srcdir}/prelude.cf $@
 
 libcfa-prelude.o : libcfa-prelude.c

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 17 12:59:06 2015
-// Update Count     : 179
+// Last Modified On : Thu Nov 19 22:31:40 2015
+// Update Count     : 168
 //
 
@@ -187 +187 @@
                 // read in the builtins and the prelude
                 if ( ! nopreludep ) {                                                   // include gcc builtins
-                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
-                        FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                        FILE * builtins = fopen( CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
                                 std::cerr << "Error: can't open builtins" << std::endl;
@@ -197 +196 @@
 
                         if ( ! libcfap ) {
-                                // read the prelude in, if not generating the cfa library
+                                // read the prelude in, if we're not generating the cfa library
                                 FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
@@ -204 +203 @@
                                 } // if
                     
-                                parse( prelude, LinkageSpec::Intrinsic );
+                    parse( prelude, LinkageSpec::Intrinsic );
                         } // if
                 } // if
 
-                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );      
+                if ( libcfap ) {
+                        parse( input, LinkageSpec::Intrinsic ); 
+                } else {
+                        parse( input, LinkageSpec::Cforall, grammarp ); 
+                }
   
                 if ( parsep ) {