Switch from priority_queue to multimap

[slidingtile] / Makefile

diff --git a/Makefile b/Makefile
index 40126d96abac13e69aa2c20c36476e879dd37b65..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,7 +12,6 @@ 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)
 
 
 all:    $(MAIN) $(TESTS)
 


@@ -33,15 +32,19 @@ depend: $(SRCS) $(TEST_SRCS)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 
 # 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: 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/gnu/stubs-32.h
-sliding_tile_lib_test.o: /usr/include/bits/types.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/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