diff options
| author | Gabriel Dos Reis <gdr@axiomatics.org> | 2017-01-15 09:32:57 -0800 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@axiomatics.org> | 2017-01-15 09:32:57 -0800 |
| commit | 7fab46eaa3de8e530863269556676e9de810758a (patch) | |
| tree | 80f07bed6d90d8ccfc2f641a7a7c439b09896f07 /src | |
| parent | cea95f2cc443a5bee5cb69476ae73fd99d32fc0d (diff) | |
| download | open-axiom-7fab46eaa3de8e530863269556676e9de810758a.tar.gz | |
Require C++14.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/utils/Makefile.am | 3 | ||||
| -rw-r--r-- | src/utils/Makefile.in | 6 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1b1bda72..974b72e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,7 +80,7 @@ stamp-subdirs: all-driver: all-utils all-lib cd driver && $(MAKE) $(AM_MAKEFLAGS) $@ -all-utils: stamp-subdirs all-headers +all-utils: stamp-subdirs all-lib cd utils && $(MAKE) $(AM_MAKEFLAGS) $@ all-rt: all-utils @@ -105,7 +105,7 @@ all-share: all-doc: stamp-subdirs cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ -all-lib: stamp-subdirs all-utils +all-lib: stamp-subdirs all-headers cd lib && $(MAKE) $(AM_MAKEFLAGS) $@ all-lisp: all-lib all-driver diff --git a/src/Makefile.in b/src/Makefile.in index 68d49d27..1ac3530b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -763,7 +763,7 @@ stamp-subdirs: all-driver: all-utils all-lib cd driver && $(MAKE) $(AM_MAKEFLAGS) $@ -all-utils: stamp-subdirs all-headers +all-utils: stamp-subdirs all-lib cd utils && $(MAKE) $(AM_MAKEFLAGS) $@ all-rt: all-utils @@ -788,7 +788,7 @@ all-share: all-doc: stamp-subdirs cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ -all-lib: stamp-subdirs all-utils +all-lib: stamp-subdirs all-headers cd lib && $(MAKE) $(AM_MAKEFLAGS) $@ all-lisp: all-lib all-driver diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index a4963851..bc2f1f73 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -32,7 +32,8 @@ noinst_PROGRAMS = hammer$(EXEEXT) hammer_SOURCES = hammer.cc hammer_LDADD = \ - $(oa_target_libdir)/libOpenAxiom.a + $(oa_target_libdir)/libOpenAxiom.a \ + $(oa_target_libdir)/libopen-axiom-core.a noinst_LIBRARIES = libOpenAxiom.a diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in index 7c6d5798..5f977ae5 100644 --- a/src/utils/Makefile.in +++ b/src/utils/Makefile.in @@ -152,7 +152,8 @@ libOpenAxiom_a_OBJECTS = $(am_libOpenAxiom_a_OBJECTS) PROGRAMS = $(noinst_PROGRAMS) am_hammer_OBJECTS = hammer.$(OBJEXT) hammer_OBJECTS = $(am_hammer_OBJECTS) -hammer_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a +hammer_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a \ + $(oa_target_libdir)/libopen-axiom-core.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -415,7 +416,8 @@ void_type = @void_type@ noinst_PROGRAMS = hammer$(EXEEXT) hammer_SOURCES = hammer.cc hammer_LDADD = \ - $(oa_target_libdir)/libOpenAxiom.a + $(oa_target_libdir)/libOpenAxiom.a \ + $(oa_target_libdir)/libopen-axiom-core.a noinst_LIBRARIES = libOpenAxiom.a libOpenAxiom_a_SOURCES = \ |