Merge pull request #451 from tautschnig/phd-project-build

Make non-default targets (aa-symex etc) actually build

Author: peterschrammel

.travis.yml

@@ -41,4 +41,4 @@ matrix:
 script:
   - make -C src minisat2-download
   - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 && make -C regression test
-  - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 cegis.dir musketeer.dir
+  - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 aa-symex.dir cegis.dir clobber.dir memory-models.dir musketeer.dir

src/Makefile

@@ -1,7 +1,8 @@
 DIRS = ansi-c big-int cbmc cpp goto-cc goto-instrument goto-programs \
        goto-symex langapi pointer-analysis solvers util linking xmllang \
        assembler analyses java_bytecode aa-path-symex path-symex musketeer \
-       json cegis goto-analyzer jsil symex goto-diff
+       json cegis goto-analyzer jsil symex goto-diff aa-symex clobber \
+       memory-models
 
 all: cbmc.dir goto-cc.dir goto-instrument.dir symex.dir goto-analyzer.dir goto-diff.dir
 
@@ -43,6 +44,8 @@ symex.dir: languages goto-programs.dir pointer-analysis.dir \
            goto-symex.dir linking.dir analyses.dir solvers.dir \
            path-symex.dir goto-instrument.dir
 
+aa-symex.dir: symex.dir aa-path-symex.dir
+
 # building for a particular directory
 
 $(patsubst %, %.dir, $(DIRS)):

src/aa-path-symex/Makefile

@@ -1,5 +1,4 @@
-SRC = locs.cpp var_map.cpp path_symex_history.cpp path_symex_state.cpp \
-      path_symex.cpp build_goto_trace.cpp
+SRC = path_symex_state.cpp path_symex.cpp build_goto_trace.cpp
 
 INCLUDES= -I ..
 

src/aa-path-symex/build_goto_trace.cpp

@@ -0,0 +1 @@
+../path-symex/build_goto_trace.cpp

src/aa-path-symex/build_goto_trace.cpp

@@ -0,0 +1 @@
+../path-symex/build_goto_trace.h