Bound the frontier. I.e., do beam search.

[slidingtile] / Makefile

diff --git a/Makefile b/Makefile
index a8608d05b3934b9ba425e3b4c97768813eeeffe1..892b3ebca0d8faaf908bfc6c295c2db3a9474035 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 CXX = g++
 CXX = g++

-CXXFLAGS = -std=gnu++11 -Wall -Wextra -pedantic -O2
+CXXFLAGS = -std=gnu++11 -Wall -Wextra -pedantic -Werror -O2 -Wstrict-overflow=2

 LFLAGS =
 
 SRCS = sliding_tile.cc sliding_tile_lib.cc
 MAIN = sliding_tile
 LFLAGS =
 
 SRCS = sliding_tile.cc sliding_tile_lib.cc
 MAIN = sliding_tile

-LIBS =
+LIBS = -lgflags

 TESTLIBS = -lgtest_main -lgtest -lgmock
 
 OBJS = $(SRCS:.cc=.o)
 TESTLIBS = -lgtest_main -lgtest -lgmock
 
 OBJS = $(SRCS:.cc=.o)


@@ -12,12 +12,11 @@ TEST_SRCS=$(wildcard *_test.cc)
 TESTS=$(subst .cc,,$(TEST_SRCS))
 
 .PHONY: depend clean test
 TESTS=$(subst .cc,,$(TEST_SRCS))
 
 .PHONY: depend clean test

-.INTERMEDIATE: $(OBJS)

 
 all:    $(MAIN) $(TESTS)
 
 test:   $(TESTS)
 
 all:    $(MAIN) $(TESTS)
 
 test:   $(TESTS)

-       for t in ./*_test; do if ! $$t; then exit 1; fi ;done
+       for t in $(TESTS); do if ./$$t; then :; else exit $$?; fi ;done

 
 clean:
        rm -f *.o $(MAIN) $(TESTS) Makefile.bak
 
 clean:
        rm -f *.o $(MAIN) $(TESTS) Makefile.bak


@@ -28,9 +27,89 @@ $(MAIN): $(OBJS)
 %_test: %_test.o %.o
        $(CXX) $(CXXFLAGS) -o $@ $^ $(LFLAGS) $(LIBS) $(TESTLIBS)
 
 %_test: %_test.o %.o
        $(CXX) $(CXXFLAGS) -o $@ $^ $(LFLAGS) $(LIBS) $(TESTLIBS)
 

-depend: $(SRCS)
+depend: $(SRCS) $(TEST_SRCS)

        makedepend $^
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
        makedepend $^
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

-sliding_tile.o: sliding_tile_lib.h
+sliding_tile.o: sliding_tile_lib.h /usr/include/gflags/gflags.h
+sliding_tile.o: /usr/include/gflags/gflags_declare.h /usr/include/stdint.h
+sliding_tile.o: /usr/include/features.h /usr/include/stdc-predef.h
+sliding_tile.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+sliding_tile.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
+sliding_tile_lib.o: sliding_tile_lib.h
+sliding_tile_lib_test.o: sliding_tile_lib.h /usr/include/gtest/gtest.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-internal.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-port.h
+sliding_tile_lib_test.o: /usr/include/ctype.h /usr/include/features.h
+sliding_tile_lib_test.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h
+sliding_tile_lib_test.o: /usr/include/bits/wordsize.h
+sliding_tile_lib_test.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h
+sliding_tile_lib_test.o: /usr/include/bits/typesizes.h /usr/include/endian.h
+sliding_tile_lib_test.o: /usr/include/bits/endian.h
+sliding_tile_lib_test.o: /usr/include/bits/byteswap.h
+sliding_tile_lib_test.o: /usr/include/bits/byteswap-16.h
+sliding_tile_lib_test.o: /usr/include/xlocale.h /usr/include/stdlib.h
+sliding_tile_lib_test.o: /usr/include/bits/waitflags.h
+sliding_tile_lib_test.o: /usr/include/bits/waitstatus.h
+sliding_tile_lib_test.o: /usr/include/sys/types.h /usr/include/time.h
+sliding_tile_lib_test.o: /usr/include/sys/select.h /usr/include/bits/select.h
+sliding_tile_lib_test.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+sliding_tile_lib_test.o: /usr/include/sys/sysmacros.h
+sliding_tile_lib_test.o: /usr/include/bits/pthreadtypes.h
+sliding_tile_lib_test.o: /usr/include/alloca.h
+sliding_tile_lib_test.o: /usr/include/bits/stdlib-float.h
+sliding_tile_lib_test.o: /usr/include/stdio.h /usr/include/libio.h
+sliding_tile_lib_test.o: /usr/include/_G_config.h /usr/include/wchar.h
+sliding_tile_lib_test.o: /usr/include/bits/stdio_lim.h
+sliding_tile_lib_test.o: /usr/include/bits/sys_errlist.h
+sliding_tile_lib_test.o: /usr/include/string.h /usr/include/sys/stat.h
+sliding_tile_lib_test.o: /usr/include/bits/stat.h /usr/include/unistd.h
+sliding_tile_lib_test.o: /usr/include/bits/posix_opt.h
+sliding_tile_lib_test.o: /usr/include/bits/environments.h
+sliding_tile_lib_test.o: /usr/include/bits/confname.h /usr/include/getopt.h
+sliding_tile_lib_test.o: /usr/include/strings.h /usr/include/regex.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest-message.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-string.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-filepath.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-type-util.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest-death-test.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-death-test-internal.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest-param-test.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-param-util.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-linked_ptr.h
+sliding_tile_lib_test.o: /usr/include/assert.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest-printers.h
+sliding_tile_lib_test.o: /usr/include/gtest/internal/gtest-param-util-generated.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest_prod.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest-test-part.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest-typed-test.h
+sliding_tile_lib_test.o: /usr/include/gtest/gtest_pred_impl.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-actions.h
+sliding_tile_lib_test.o: /usr/include/errno.h /usr/include/bits/errno.h
+sliding_tile_lib_test.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
+sliding_tile_lib_test.o: /usr/include/asm-generic/errno.h
+sliding_tile_lib_test.o: /usr/include/asm-generic/errno-base.h
+sliding_tile_lib_test.o: /usr/include/gmock/internal/gmock-internal-utils.h
+sliding_tile_lib_test.o: /usr/include/gmock/internal/gmock-generated-internal-utils.h
+sliding_tile_lib_test.o: /usr/include/gmock/internal/gmock-port.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-cardinalities.h
+sliding_tile_lib_test.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h
+sliding_tile_lib_test.o: /usr/include/bits/local_lim.h
+sliding_tile_lib_test.o: /usr/include/linux/limits.h
+sliding_tile_lib_test.o: /usr/include/bits/posix2_lim.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-generated-actions.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-generated-function-mockers.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-spec-builders.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-matchers.h
+sliding_tile_lib_test.o: /usr/include/math.h /usr/include/bits/huge_val.h
+sliding_tile_lib_test.o: /usr/include/bits/huge_valf.h
+sliding_tile_lib_test.o: /usr/include/bits/huge_vall.h
+sliding_tile_lib_test.o: /usr/include/bits/inf.h /usr/include/bits/nan.h
+sliding_tile_lib_test.o: /usr/include/bits/mathdef.h
+sliding_tile_lib_test.o: /usr/include/bits/mathcalls.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-generated-nice-strict.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-generated-matchers.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-more-actions.h
+sliding_tile_lib_test.o: /usr/include/gmock/gmock-more-matchers.h