Changes in / [69911c11:c23f807]
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
configure
r69911c11 rc23f807 2999 2999 cfa_incdir="${cfa_prefix}/include" 3000 3000 else 3001 cfa_incdir=${ $includedir}3001 cfa_incdir=${includedir} 3002 3002 fi 3003 3003 -
configure.ac
r69911c11 rc23f807 41 41 cfa_incdir="${cfa_prefix}/include" 42 42 else 43 cfa_incdir=${ $includedir}43 cfa_incdir=${includedir} 44 44 fi 45 45 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.]) -
src/Makefile.in
r69911c11 rc23f807 413 413 esac; \ 414 414 done; \ 415 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \415 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 416 416 $(am__cd) $(top_srcdir) && \ 417 $(AUTOMAKE) -- gnusrc/Makefile417 $(AUTOMAKE) --foreign src/Makefile 418 418 .PRECIOUS: Makefile 419 419 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/driver/Makefile.in
r69911c11 rc23f807 195 195 esac; \ 196 196 done; \ 197 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/driver/Makefile'; \197 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \ 198 198 $(am__cd) $(top_srcdir) && \ 199 $(AUTOMAKE) -- gnusrc/driver/Makefile199 $(AUTOMAKE) --foreign src/driver/Makefile 200 200 .PRECIOUS: Makefile 201 201 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/examples/Makefile.in
r69911c11 rc23f807 191 191 esac; \ 192 192 done; \ 193 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/examples/Makefile'; \193 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \ 194 194 $(am__cd) $(top_srcdir) && \ 195 $(AUTOMAKE) -- gnusrc/examples/Makefile195 $(AUTOMAKE) --foreign src/examples/Makefile 196 196 .PRECIOUS: Makefile 197 197 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/libcfa/Makefile.am
r69911c11 rc23f807 11 11 ## Created On : Sun May 31 08:54:01 2015 12 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Thu Jun 4 22:49:16201514 ## Update Count : 713 ## Last Modified On : Wed Dec 16 22:58:17 2015 14 ## Update Count : 9 15 15 ############################################################################### 16 16 … … 44 44 45 45 libcfa-prelude.c : ${srcdir}/prelude.cf 46 ${libdir}/cfa-cpp -l ${srcdir}/prelude.cf $@46 ../cfa-cpp -l ${srcdir}/prelude.cf $@ # use src/cfa-cpp as not in lib until after install 47 47 48 48 libcfa-prelude.o : libcfa-prelude.c -
src/libcfa/Makefile.in
r69911c11 rc23f807 220 220 esac; \ 221 221 done; \ 222 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/libcfa/Makefile'; \222 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcfa/Makefile'; \ 223 223 $(am__cd) $(top_srcdir) && \ 224 $(AUTOMAKE) -- gnusrc/libcfa/Makefile224 $(AUTOMAKE) --foreign src/libcfa/Makefile 225 225 .PRECIOUS: Makefile 226 226 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status … … 542 542 543 543 libcfa-prelude.c : ${srcdir}/prelude.cf 544 ${libdir}/cfa-cpp -l ${srcdir}/prelude.cf $@544 ../cfa-cpp -l ${srcdir}/prelude.cf $@ # use src/cfa-cpp as not in lib until after install 545 545 546 546 libcfa-prelude.o : libcfa-prelude.c -
src/main.cc
r69911c11 rc23f807 10 10 // Created On : Fri May 15 23:12:02 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 22:31:40201513 // Update Count : 1 6812 // Last Modified On : Thu Dec 17 12:59:06 2015 13 // Update Count : 179 14 14 // 15 15 … … 187 187 // read in the builtins and the prelude 188 188 if ( ! nopreludep ) { // include gcc builtins 189 FILE * builtins = fopen( CFA_LIBDIR "/builtins.cf", "r" ); 189 // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here. 190 FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" ); 190 191 if ( builtins == NULL ) { 191 192 std::cerr << "Error: can't open builtins" << std::endl; … … 196 197 197 198 if ( ! libcfap ) { 198 // read the prelude in, if we'renot generating the cfa library199 // read the prelude in, if not generating the cfa library 199 200 FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" ); 200 201 if ( prelude == NULL ) { … … 203 204 } // if 204 205 205 206 parse( prelude, LinkageSpec::Intrinsic ); 206 207 } // if 207 208 } // if 208 209 209 if ( libcfap ) { 210 parse( input, LinkageSpec::Intrinsic ); 211 } else { 212 parse( input, LinkageSpec::Cforall, grammarp ); 213 } 210 parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp ); 214 211 215 212 if ( parsep ) {
Note: See TracChangeset
for help on using the changeset viewer.