From 11fd57def249cbc6f4aee8dfaac5e7f346f483c0 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 29 Nov 2014 19:21:28 +0000 Subject: Move code from bemol.cc to library. --- src/utils/Makefile.am | 1 + src/utils/Makefile.in | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) (limited to 'src/utils') diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 8c0bec65..0febb681 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -40,6 +40,7 @@ libOpenAxiom_a_SOURCES = \ filesystem.cc \ ../io/Input.cc \ ../io/std-streams.cc \ + ../io/InputFragment.cxx \ ../syntax/token.cc \ ../syntax/sexpr.cc \ ../rt/vm.cc \ diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in index 4600bb81..97cd1a0b 100644 --- a/src/utils/Makefile.in +++ b/src/utils/Makefile.in @@ -139,9 +139,10 @@ libOpenAxiom_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp am_libOpenAxiom_a_OBJECTS = storage.$(OBJEXT) string-pool.$(OBJEXT) \ command.$(OBJEXT) filesystem.$(OBJEXT) ../io/Input.$(OBJEXT) \ - ../io/std-streams.$(OBJEXT) ../syntax/token.$(OBJEXT) \ - ../syntax/sexpr.$(OBJEXT) ../rt/vm.$(OBJEXT) \ - ../rt/Lisp.$(OBJEXT) ../rt/Database.$(OBJEXT) + ../io/std-streams.$(OBJEXT) ../io/InputFragment.$(OBJEXT) \ + ../syntax/token.$(OBJEXT) ../syntax/sexpr.$(OBJEXT) \ + ../rt/vm.$(OBJEXT) ../rt/Lisp.$(OBJEXT) \ + ../rt/Database.$(OBJEXT) libOpenAxiom_a_OBJECTS = $(am_libOpenAxiom_a_OBJECTS) PROGRAMS = $(noinst_PROGRAMS) am_hammer_OBJECTS = hammer.$(OBJEXT) @@ -412,6 +413,7 @@ libOpenAxiom_a_SOURCES = \ filesystem.cc \ ../io/Input.cc \ ../io/std-streams.cc \ + ../io/InputFragment.cxx \ ../syntax/token.cc \ ../syntax/sexpr.cc \ ../rt/vm.cc \ @@ -475,6 +477,8 @@ clean-noinstLIBRARIES: ../io/$(DEPDIR)/$(am__dirstamp) ../io/std-streams.$(OBJEXT): ../io/$(am__dirstamp) \ ../io/$(DEPDIR)/$(am__dirstamp) +../io/InputFragment.$(OBJEXT): ../io/$(am__dirstamp) \ + ../io/$(DEPDIR)/$(am__dirstamp) ../syntax/$(am__dirstamp): @$(MKDIR_P) ../syntax @: > ../syntax/$(am__dirstamp) @@ -526,6 +530,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@../io/$(DEPDIR)/Input.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../io/$(DEPDIR)/InputFragment.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../io/$(DEPDIR)/std-streams.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../rt/$(DEPDIR)/Database.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../rt/$(DEPDIR)/Lisp.Po@am__quote@ @@ -562,6 +567,30 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< +.cxx.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cxx.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cxx.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo -- cgit v1.2.3