diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-06-02 23:04:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-06-02 23:04:55 +0000 |
| commit | 640477f91eae7560dd7b46499caf0818e51dfb9e (patch) | |
| tree | 4bc692e5d3c1a709b4ca690073a79d40ea86baf4 /src | |
| parent | 761e0f5d002dc199db16b996aafa60d6df6afcd7 (diff) | |
| download | open-axiom-640477f91eae7560dd7b46499caf0818e51dfb9e.tar.gz | |
more utility code consolidation
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/driver/Makefile.in | 8 | ||||
| -rw-r--r-- | src/gui/debate.cc | 1 | ||||
| -rw-r--r-- | src/utils/Makefile.in | 9 | ||||
| -rw-r--r-- | src/utils/command.cc (renamed from src/driver/utils.cc) | 0 |
6 files changed, 14 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 482f3748..77d90c46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,7 @@ stamp-subdirs: .PHONY: $(oa_all_targets) -all-driver: all-lib +all-driver: all-utils all-lib cd driver && $(MAKE) $(AM_MAKEFLAGS) $@ all-utils: stamp-subdirs diff --git a/src/Makefile.in b/src/Makefile.in index 43b89d32..8d880d42 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -674,7 +674,7 @@ stamp-subdirs: .PHONY: $(oa_all_targets) -all-driver: all-lib +all-driver: all-utils all-lib cd driver && $(MAKE) $(AM_MAKEFLAGS) $@ all-utils: stamp-subdirs diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in index 5ad25526..1769b44c 100644 --- a/src/driver/Makefile.in +++ b/src/driver/Makefile.in @@ -32,11 +32,14 @@ bin_PROGRAMS = open-axiom$(EXEEXT) -open_axiom_SOURCES = main.cc utils.cc +open_axiom_SOURCES = main.cc open_axiom_objects = $(open_axiom_SOURCES:.cc=.lo) -open_axiom_LDADD = -L$(builddir)/../lib $(oa_c_libs) +open_axiom_LDADD = \ + -L$(axiom_target_libdir)/ \ + -L$(builddir)/../lib \ + -lOpenAxiom $(oa_c_libs) VPATH += $(top_srcdir)/src/include @@ -59,7 +62,6 @@ stamp: $(bin_PROGRAMS) -DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\"" \ $(axiom_includes) $< -utils.lo: open-axiom.h main.lo: open-axiom.h open-axiom$(EXEEXT): $(open_axiom_objects) diff --git a/src/gui/debate.cc b/src/gui/debate.cc index 92209db8..35740c37 100644 --- a/src/gui/debate.cc +++ b/src/gui/debate.cc @@ -33,6 +33,7 @@ #include <QScrollBar> #include "debate.h" #include <iostream> +#include "open-axiom.h" namespace OpenAxiom { diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in index 764bda0f..1352cfea 100644 --- a/src/utils/Makefile.in +++ b/src/utils/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2010, Gabriel Dos Reis. +# Copyright (C) 2011, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -37,7 +37,7 @@ hammer_OBJECTS = $(hammer_SOURCES:.cc=.lo) hammer_LDADD = -L. -lOpenAxiom libOpenAxiom_HEADERS = storage.H hash-table.H string-pool.H sexpr.H -libOpenAxiom_SOURCES = storage.cc string-pool.cc sexpr.cc +libOpenAxiom_SOURCES = storage.cc string-pool.cc sexpr.cc command.cc libOpenAxiom_OBJECTS = $(libOpenAxiom_SOURCES:.cc=.lo) oa_public_headers = storage hash-table string-pool sexpr @@ -45,7 +45,10 @@ oa_public_headers = storage hash-table string-pool sexpr ## Where we store public header files oa_target_headerdir = $(oa_target_includedir)/open-axiom -oa_include_flags = -I. -I$(oa_target_includedir) -I$(top_builddir)/config +oa_include_flags = -I. -I$(oa_target_includedir) \ + -I$(top_builddir)/config \ + -I$(top_srcdir)/src/include \ + -DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\"" oa_target_oalib = $(axiom_target_libdir)/libOpenAxiom.$(LIBEXT) diff --git a/src/driver/utils.cc b/src/utils/command.cc index 498e2f4e..498e2f4e 100644 --- a/src/driver/utils.cc +++ b/src/utils/command.cc |