Switch to doing all the compile configuration in Makefile.inc.

It was getting to be really bad to have each directory have its own
settings for the compilers.  Now everything should use the same
include file with CC, CXX, CFLAGS, CXXFLAGS, etc.  At least that will
be true for these Makefiles and will have to be done differently when
there are other build systems present.

#65

Makefile

@@ -44,10 +44,22 @@ real-clean: clean
 gsf:
 	(cd src/gsf && make libgsf.a)
 
+gsf-obj:
+	(cd src/gsf && make obj)
+
 gsf-test:
 	(cd src/gsf && make libgsf.a)
 	(cd tests/gsf && make test)
 
+gsfxx:
+	(cd src/gsfxx && make libgsfxx.a)
+
+gsfxx-obj:
+	(cd src/gsfxx && make obj)
+
 gsfxx-test:
 	(cd src/gsfxx && make libgsfxx.a)
 	(cd tests/gsfxx && make test)
+
+obj: gsf-obj gsfxx-obj
+

Makefile.inc

@@ -0,0 +1,37 @@
+# -*- makefile -*-
+
+CC := clang
+CXX := clang++
+
+WARN :=
+WARN := -Wall
+WARN += -Wextra
+
+ifdef ERROR
+  WARN += -Werror
+endif
+
+CFLAGS := ${WARN}
+
+CXXFLAGS += -std=c++11
+# CXXFLAGS += -pthread
+CXXFLAGS += ${WARN}
+
+DBG := -g
+DBG += -O0
+
+OPT := -O3
+OPT += -funroll-loops
+# Not supposed by clang.
+# OPT += -fexpensive-optimizations
+OPT += -ffast-math
+OPT += -DNDEBUG
+
+ifdef OPTIMIZE
+  CFLAGS += ${OPT}
+  CXXFLAGS += ${OPT}
+else
+  CFLAGS += ${DBG}
+  CXXFLAGS += ${DBG}
+endif
+

src/bin/Makefile

@@ -12,34 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-BIN := gsf_index
-
-WARN := -Wall
-WARN += -Wextra
-# WARN += -Werror
-
-DBG := -g3 -DDEBUG=1
-DBG += -O0
-
-OPT := -O3
-OPT += -funroll-loops
-OPT += -fexpensive-optimizations
-OPT += -ffast-math
-OPT += -DNDEBUG
+include ../../Makefile.inc
 
-CXXFLAGS := ${WARN}
-CXXFLAGS += -std=c++11
+BIN := gsf_index
 
 CPPFLAGS := -I../gsf -I../gsfxx
 LDFLAGS := -L../gsfxx
 
-ifdef OPTIMIZE
-  CXXFLAGS += ${OPT}
-else
-  CXXFLAGS += ${DBG}
-endif
-
-
 all: ${BIN}
 	@echo "Done"
 

src/gsf/Makefile

@@ -12,33 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# CC := gcc-5
-
-WARN := -Wall
-WARN += -Wextra
-
-ifdef ERROR
-  WARN += -Werror
-endif
-
-DBG := -g3
-DBG += -O0
-
-OPT := -O3
-OPT += -funroll-loops
-# Not supposed by clang.
-# OPT += -fexpensive-optimizations
-OPT += -ffast-math
-OPT += -DNDEBUG
-
-CFLAGS := ${WARN}
-
-ifdef OPTIMIZE
-  CFLAGS += ${OPT}
-else
-  CFLAGS += ${DBG}
-endif
-
+include ../../Makefile.inc
 
 SRCS := $(wildcard *.c)
 OBJS := ${SRCS:.c=.o}
@@ -50,6 +24,8 @@ ${LIB}: ${OBJS}
 
 all: ${LIB}
 
+obj: ${OBJS}
+
 clean:
 	-rm -f *.o
 	-rm -f ${LIB}

src/gsfxx/Makefile

@@ -12,38 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-WARN := -Wall
-WARN += -Wextra
-
-ifdef ERROR
-  WARN += -Werror
-endif
-
-DBG := -g3
-DBG += -O0
-
-OPT := -O3
-OPT += -funroll-loops
-OPT += -fexpensive-optimizations
-OPT += -ffast-math
-OPT += -DNDEBUG
-
-CPPFLAGS := ${WARN}
-
-ifdef OPTIMIZE
-  CPPFLAGS += ${OPT}
-else
-  CPPFLAGS += ${DBG}
-endif
-
-CXXFLAGS += -std=c++11
+include ../../Makefile.inc
 
 SRCS := $(wildcard *.cc)
 OBJS := ${SRCS:.cc=.o}
 LIB := libgsfxx.a
 
 all: ${LIB}
 
+obj: ${OBJS}
+
 clean:
 	-rm -f *.o
 	-rm -f ${LIB}

tests/gsf/Makefile

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include ../../Makefile.inc
+
 TESTS := index_test
 TESTS += read_gsf_2_9_test
 TESTS += read_gsf_3_6_test
@@ -41,22 +43,6 @@ CPPFLAGS += -isystem $(GMOCK_DIR)/include
 CPPFLAGS +=  -I../../src/gsf
 CPPFLAGS += -I$(GTEST_DIR) -I$(GMOCK_DIR)
 
-CXXFLAGS += -std=c++11
-CXXFLAGS += -Wall -Wextra -pthread
-
-DBG := -g
-DBG += -O0
-
-OPT := -O3
-OPT += -funroll-loops -fexpensive-optimizations -ffast-math
-
-ifdef OPTIMIZE
-  CXXFLAGS += ${OPT}
-else
-  CXXFLAGS += ${DBG}
-endif
-
-
 GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
 		$(GTEST_DIR)/include/gtest/internal/*.h
 

tests/gsfxx/Makefile

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include ../../Makefile.inc
+
 TESTS :=
 TESTS += records_test
 TESTS += util_test
@@ -40,21 +42,6 @@ CPPFLAGS += -isystem $(GMOCK_DIR)/include
 CPPFLAGS += -I../../src/gsfxx
 CPPFLAGS += -I$(GTEST_DIR) -I$(GMOCK_DIR)
 
-CXXFLAGS += -std=c++11
-CXXFLAGS += -Wall -Wextra -pthread
-
-DBG := -g
-DBG += -O0
-
-OPT := -O3
-OPT += -funroll-loops -fexpensive-optimizations -ffast-math
-
-ifdef OPTIMIZE
-  CXXFLAGS += ${OPT}
-else
-  CXXFLAGS += ${DBG}
-endif
-
 LDFLAGS := -L../../src/gsfxx -lgsfxx
 # TODO(schwehr): Move the gtest build stuff to its own directory.
 LDFLAGS += -L.