diff --git a/.gitignore b/.gitignore index 2891f44..eb1c1f1 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ Makefile.in /scratch /src/.deps + +/config.log +src/lionheart diff --git a/Makefile b/Makefile index af57a91..fdcc4e9 100644 --- a/Makefile +++ b/Makefile @@ -186,7 +186,7 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ - INSTALL README compile depcomp install-sh missing + INSTALL README TODO compile depcomp install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/config.log b/config.log deleted file mode 100644 index b254d5b..0000000 --- a/config.log +++ /dev/null @@ -1,572 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by lionheart configure 20000916, which was -generated by GNU Autoconf 2.69. Invocation command line was - - $ ./configure - -## --------- ## -## Platform. ## -## --------- ## - -hostname = julian.amyanddavid.net -uname -m = amd64 -uname -r = 6.1 -uname -s = OpenBSD -uname -v = GENERIC.MP#7 - -/usr/bin/uname -p = amd64 -/bin/uname -X = unknown - -/bin/arch = unknown -/usr/bin/arch -k = OpenBSD.amd64 -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /home/david/bin -PATH: /home/david/.local/bin -PATH: /home/david/.node_modules_global/bin -PATH: /bin -PATH: /sbin -PATH: /usr/bin -PATH: /usr/sbin -PATH: /usr/X11R6/bin -PATH: /usr/local/bin -PATH: /usr/local/sbin -PATH: /usr/local/jdk-1.7.0/bin/ -PATH: /usr/games - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:2284: checking for a BSD-compatible install -configure:2352: result: /usr/bin/install -c -configure:2363: checking whether build environment is sane -configure:2418: result: yes -configure:2569: checking for a thread-safe mkdir -p -configure:2608: result: /usr/local/bin/gmkdir -p -configure:2615: checking for gawk -configure:2631: found /usr/local/bin/gawk -configure:2642: result: gawk -configure:2653: checking whether make sets $(MAKE) -configure:2675: result: yes -configure:2704: checking whether make supports nested variables -configure:2721: result: yes -configure:2911: checking for g++ -configure:2927: found /usr/bin/g++ -configure:2938: result: g++ -configure:2965: checking for C++ compiler version -configure:2974: g++ --version >&5 -g++ (GCC) 4.2.1 20070719 -Copyright (C) 2007 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:2985: $? = 0 -configure:2974: g++ -v >&5 -Reading specs from /usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/specs -Target: amd64-unknown-openbsd6.1 -Configured with: OpenBSD/amd64 system compiler -Thread model: posix -gcc version 4.2.1 20070719 -configure:2985: $? = 0 -configure:2974: g++ -V >&5 -g++: '-V' option must have argument -configure:2985: $? = 1 -configure:2974: g++ -qversion >&5 -g++: unrecognized option '-qversion' -g++: no input files -configure:2985: $? = 1 -configure:3005: checking whether the C++ compiler works -configure:3027: g++ conftest.cpp >&5 -configure:3031: $? = 0 -configure:3079: result: yes -configure:3082: checking for C++ compiler default output file name -configure:3084: result: a.out -configure:3090: checking for suffix of executables -configure:3097: g++ -o conftest conftest.cpp >&5 -configure:3101: $? = 0 -configure:3123: result: -configure:3145: checking whether we are cross compiling -configure:3153: g++ -o conftest conftest.cpp >&5 -configure:3157: $? = 0 -configure:3164: ./conftest -configure:3168: $? = 0 -configure:3183: result: no -configure:3188: checking for suffix of object files -configure:3210: g++ -c conftest.cpp >&5 -configure:3214: $? = 0 -configure:3235: result: o -configure:3239: checking whether we are using the GNU C++ compiler -configure:3258: g++ -c conftest.cpp >&5 -configure:3258: $? = 0 -configure:3267: result: yes -configure:3276: checking whether g++ accepts -g -configure:3296: g++ -c -g conftest.cpp >&5 -configure:3296: $? = 0 -configure:3337: result: yes -configure:3371: checking for style of include used by make -configure:3399: result: GNU -configure:3425: checking dependency style of g++ -configure:3536: result: gcc3 -configure:3599: checking for gcc -configure:3615: found /usr/bin/gcc -configure:3626: result: gcc -configure:3855: checking for C compiler version -configure:3864: gcc --version >&5 -gcc (GCC) 4.2.1 20070719 -Copyright (C) 2007 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:3875: $? = 0 -configure:3864: gcc -v >&5 -Reading specs from /usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/specs -Target: amd64-unknown-openbsd6.1 -Configured with: OpenBSD/amd64 system compiler -Thread model: posix -gcc version 4.2.1 20070719 -configure:3875: $? = 0 -configure:3864: gcc -V >&5 -gcc: '-V' option must have argument -configure:3875: $? = 1 -configure:3864: gcc -qversion >&5 -gcc: unrecognized option '-qversion' -gcc: no input files -configure:3875: $? = 1 -configure:3879: checking whether we are using the GNU C compiler -configure:3898: gcc -c conftest.c >&5 -configure:3898: $? = 0 -configure:3907: result: yes -configure:3916: checking whether gcc accepts -g -configure:3936: gcc -c -g conftest.c >&5 -configure:3936: $? = 0 -configure:3977: result: yes -configure:3994: checking for gcc option to accept ISO C89 -configure:4057: gcc -c -g -O2 conftest.c >&5 -configure:4057: $? = 0 -configure:4070: result: none needed -configure:4095: checking whether gcc understands -c and -o together -configure:4117: gcc -c conftest.c -o conftest2.o -configure:4120: $? = 0 -configure:4117: gcc -c conftest.c -o conftest2.o -configure:4120: $? = 0 -configure:4132: result: yes -configure:4151: checking dependency style of gcc -configure:4262: result: gcc3 -configure:4282: checking how to run the C preprocessor -configure:4313: gcc -E conftest.c -configure:4313: $? = 0 -configure:4327: gcc -E conftest.c -conftest.c:11:28: error: ac_nonexistent.h: No such file or directory -configure:4327: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "lionheart" -| #define PACKAGE_TARNAME "lionheart" -| #define PACKAGE_VERSION "20000916" -| #define PACKAGE_STRING "lionheart 20000916" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "lionheart" -| #define VERSION "20000916" -| /* end confdefs.h. */ -| #include -configure:4352: result: gcc -E -configure:4372: gcc -E conftest.c -configure:4372: $? = 0 -configure:4386: gcc -E conftest.c -conftest.c:11:28: error: ac_nonexistent.h: No such file or directory -configure:4386: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "lionheart" -| #define PACKAGE_TARNAME "lionheart" -| #define PACKAGE_VERSION "20000916" -| #define PACKAGE_STRING "lionheart 20000916" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "lionheart" -| #define VERSION "20000916" -| /* end confdefs.h. */ -| #include -configure:4420: checking for grep that handles long lines and -e -configure:4478: result: /usr/bin/grep -configure:4483: checking for egrep -configure:4545: result: /usr/bin/grep -E -configure:4550: checking for ANSI C header files -configure:4570: gcc -c -g -O2 conftest.c >&5 -configure:4570: $? = 0 -configure:4643: gcc -o conftest -g -O2 conftest.c >&5 -configure:4643: $? = 0 -configure:4643: ./conftest -configure:4643: $? = 0 -configure:4654: result: yes -configure:4667: checking for sys/types.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for sys/stat.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for stdlib.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for string.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for memory.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for strings.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for inttypes.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for stdint.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4667: checking for unistd.h -configure:4667: gcc -c -g -O2 conftest.c >&5 -configure:4667: $? = 0 -configure:4667: result: yes -configure:4681: checking for string.h -configure:4681: result: yes -configure:4693: checking for stdbool.h that conforms to C99 -configure:4760: gcc -c -g -O2 conftest.c >&5 -configure:4760: $? = 0 -configure:4767: result: yes -configure:4769: checking for _Bool -configure:4769: gcc -c -g -O2 conftest.c >&5 -configure:4769: $? = 0 -configure:4769: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:58: error: expected expression before ')' token -configure:4769: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "lionheart" -| #define PACKAGE_TARNAME "lionheart" -| #define PACKAGE_VERSION "20000916" -| #define PACKAGE_STRING "lionheart 20000916" -| #define PACKAGE_BUGREPORT "" -| #define PACKAGE_URL "" -| #define PACKAGE "lionheart" -| #define VERSION "20000916" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_STRING_H 1 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((_Bool))) -| return 0; -| ; -| return 0; -| } -configure:4769: result: yes -configure:4780: checking for inline -configure:4796: gcc -c -g -O2 conftest.c >&5 -configure:4796: $? = 0 -configure:4804: result: inline -configure:4827: checking for strcasecmp -configure:4827: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c:46: warning: conflicting types for built-in function 'strcasecmp' -configure:4827: $? = 0 -configure:4827: result: yes -configure:4827: checking for strdup -configure:4827: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c:47: warning: conflicting types for built-in function 'strdup' -configure:4827: $? = 0 -configure:4827: result: yes -configure:4948: checking that generated files are newer than configure -configure:4954: result: done -configure:4981: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by lionheart config.status 20000916, which was -generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on julian.amyanddavid.net - -config.status:863: creating Makefile -config.status:863: creating src/Makefile -config.status:863: creating config.h -config.status:1044: config.h is unchanged -config.status:1092: executing depfiles commands - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_c_compiler_gnu=yes -ac_cv_c_inline=inline -ac_cv_cxx_compiler_gnu=yes -ac_cv_env_CCC_set= -ac_cv_env_CCC_value= -ac_cv_env_CC_set= -ac_cv_env_CC_value= -ac_cv_env_CFLAGS_set= -ac_cv_env_CFLAGS_value= -ac_cv_env_CPPFLAGS_set= -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_CXXFLAGS_set= -ac_cv_env_CXXFLAGS_value= -ac_cv_env_CXX_set= -ac_cv_env_CXX_value= -ac_cv_env_LDFLAGS_set= -ac_cv_env_LDFLAGS_value= -ac_cv_env_LIBS_set= -ac_cv_env_LIBS_value= -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_func_strcasecmp=yes -ac_cv_func_strdup=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_stdbool_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_unistd_h=yes -ac_cv_objext=o -ac_cv_path_EGREP='/usr/bin/grep -E' -ac_cv_path_GREP=/usr/bin/grep -ac_cv_path_install='/usr/bin/install -c' -ac_cv_path_mkdir=/usr/local/bin/gmkdir -ac_cv_prog_AWK=gawk -ac_cv_prog_CPP='gcc -E' -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_ac_ct_CXX=g++ -ac_cv_prog_cc_c89= -ac_cv_prog_cc_g=yes -ac_cv_prog_cxx_g=yes -ac_cv_prog_make_make_set=yes -ac_cv_type__Bool=yes -am_cv_CC_dependencies_compiler_type=gcc3 -am_cv_CXX_dependencies_compiler_type=gcc3 -am_cv_make_support_nested_variables=yes -am_cv_prog_cc_c_o=yes - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ACLOCAL='${SHELL} /home/david/devel/cpp/lionheart000916/missing aclocal-1.15' -AMDEPBACKSLASH='\' -AMDEP_FALSE='#' -AMDEP_TRUE='' -AMTAR='$${TAR-tar}' -AM_BACKSLASH='\' -AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -AM_DEFAULT_VERBOSITY='1' -AM_V='$(V)' -AUTOCONF='${SHELL} /home/david/devel/cpp/lionheart000916/missing autoconf' -AUTOHEADER='${SHELL} /home/david/devel/cpp/lionheart000916/missing autoheader' -AUTOMAKE='${SHELL} /home/david/devel/cpp/lionheart000916/missing automake-1.15' -AWK='gawk' -CC='gcc' -CCDEPMODE='depmode=gcc3' -CFLAGS='-g -O2' -CPP='gcc -E' -CPPFLAGS='' -CXX='g++' -CXXDEPMODE='depmode=gcc3' -CXXFLAGS='-g -O2' -CYGPATH_W='echo' -DEFS='-DHAVE_CONFIG_H' -DEPDIR='.deps' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='/usr/bin/grep -E' -EXEEXT='' -GREP='/usr/bin/grep' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' -LDFLAGS='' -LIBOBJS='' -LIBS='' -LTLIBOBJS='' -MAKEINFO='${SHELL} /home/david/devel/cpp/lionheart000916/missing makeinfo' -MKDIR_P='/usr/local/bin/gmkdir -p' -OBJEXT='o' -PACKAGE='lionheart' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='lionheart' -PACKAGE_STRING='lionheart 20000916' -PACKAGE_TARNAME='lionheart' -PACKAGE_URL='' -PACKAGE_VERSION='20000916' -PATH_SEPARATOR=':' -SET_MAKE='' -SHELL='/bin/sh' -STRIP='' -VERSION='20000916' -ac_ct_CC='gcc' -ac_ct_CXX='g++' -am__EXEEXT_FALSE='' -am__EXEEXT_TRUE='#' -am__fastdepCC_FALSE='#' -am__fastdepCC_TRUE='' -am__fastdepCXX_FALSE='#' -am__fastdepCXX_TRUE='' -am__include='include' -am__isrc='' -am__leading_dot='.' -am__nodep='_no' -am__quote='' -am__tar='$${TAR-tar} chof - "$$tardir"' -am__untar='$${TAR-tar} xf -' -bindir='${exec_prefix}/bin' -build_alias='' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -dvidir='${docdir}' -exec_prefix='${prefix}' -host_alias='' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${datarootdir}/info' -install_sh='${SHELL} /home/david/devel/cpp/lionheart000916/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -localedir='${datarootdir}/locale' -localstatedir='${prefix}/var' -mandir='${datarootdir}/man' -mkdir_p='$(MKDIR_P)' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr/local' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target_alias='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -/* confdefs.h */ -#define PACKAGE_NAME "lionheart" -#define PACKAGE_TARNAME "lionheart" -#define PACKAGE_VERSION "20000916" -#define PACKAGE_STRING "lionheart 20000916" -#define PACKAGE_BUGREPORT "" -#define PACKAGE_URL "" -#define PACKAGE "lionheart" -#define VERSION "20000916" -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_STRING_H 1 -#define HAVE__BOOL 1 -#define HAVE_STRCASECMP 1 -#define HAVE_STRDUP 1 - -configure: exit 0 - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by lionheart config.status 20000916, which was -generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status config.h - -on julian.amyanddavid.net - -config.status:863: creating config.h -config.status:1044: config.h is unchanged diff --git a/src/Makefile b/src/Makefile index 6bd153c..af1b9bd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -99,10 +99,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_lionheart_OBJECTS = lex.$(OBJEXT) main.$(OBJEXT) formula.$(OBJEXT) \ - parser.$(OBJEXT) ParamSource.$(OBJEXT) Proof.$(OBJEXT) \ - Rule.$(OBJEXT) RuleSource.$(OBJEXT) FormulaRegistry.$(OBJEXT) \ - Options.$(OBJEXT) Axiom.$(OBJEXT) copysplit.$(OBJEXT) +am_lionheart_OBJECTS = Axiom.$(OBJEXT) FormulaRegistry.$(OBJEXT) \ + Options.$(OBJEXT) ParamSource.$(OBJEXT) Proof.$(OBJEXT) \ + Rule.$(OBJEXT) RuleSource.$(OBJEXT) copysplit.$(OBJEXT) \ + formula.$(OBJEXT) lex.$(OBJEXT) main.$(OBJEXT) \ + parser.$(OBJEXT) lionheart_OBJECTS = $(am_lionheart_OBJECTS) lionheart_LDADD = $(LDADD) AM_V_P = $(am__v_P_$(V)) @@ -134,6 +135,18 @@ AM_V_CXXLD = $(am__v_CXXLD_$(V)) am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(lionheart_SOURCES) DIST_SOURCES = $(lionheart_SOURCES) am__can_run_installinfo = \ @@ -253,9 +266,31 @@ target_alias = top_build_prefix = ../ top_builddir = .. top_srcdir = .. -lionheart_SOURCES = lex.cc main.cc formula.cc parser.cc ParamSource.cc \ - Proof.cc Rule.cc RuleSource.cc FormulaRegistry.cc \ - Options.cc Axiom.cc copysplit.cc +lionheart_SOURCES = Axiom.cc \ + Axiom.h \ + FormulaRegistry.cc \ + FormulaRegistry.h \ + Markable.h \ + Options.cc \ + Options.h \ + ParamSource.cc \ + ParamSource.h \ + Proof.cc \ + Proof.h \ + Rule.cc \ + Rule.h \ + RuleSource.cc \ + RuleSource.h \ + Vector.h \ + copysplit.cc \ + copysplit.h \ + formula.cc \ + formula.h \ + lex.cc \ + lex.h \ + main.cc \ + parser.cc \ + parser.h all: all-am diff --git a/src/Makefile.am b/src/Makefile.am index de2b6a4..910d01a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,26 @@ bin_PROGRAMS = lionheart -lionheart_SOURCES = lex.cc main.cc formula.cc parser.cc ParamSource.cc \ - Proof.cc Rule.cc RuleSource.cc FormulaRegistry.cc \ - Options.cc Axiom.cc copysplit.cc +lionheart_SOURCES = Axiom.cc \ + Axiom.h \ + FormulaRegistry.cc \ + FormulaRegistry.h \ + Markable.h \ + Options.cc \ + Options.h \ + ParamSource.cc \ + ParamSource.h \ + Proof.cc \ + Proof.h \ + Rule.cc \ + Rule.h \ + RuleSource.cc \ + RuleSource.h \ + Vector.h \ + copysplit.cc \ + copysplit.h \ + formula.cc \ + formula.h \ + lex.cc \ + lex.h \ + main.cc \ + parser.cc \ + parser.h diff --git a/src/lionheart b/src/lionheart deleted file mode 100755 index 726e957..0000000 Binary files a/src/lionheart and /dev/null differ