Permalink
Browse files

set MAPNIK_PLUGINDIR as command line define rather than in generated …

…header
  • Loading branch information...
1 parent 1b3e0d3 commit 7209bded071d866bcb6a0c12ecacdc482a24f378 @springmeyer springmeyer committed Jun 11, 2014
Showing with 2 additions and 7 deletions.
  1. +2 −6 Makefile
  2. +0 −1 test/raster_tile.cpp
View
8 Makefile
@@ -25,16 +25,13 @@ python: python/vector_tile_pb2.py
test/run-test: Makefile src/vector_tile.pb.cc test/vector_tile.cpp test/test_utils.hpp src/*
$(CXX) -o ./test/run-test test/vector_tile.cpp src/vector_tile.pb.cc -I./src $(CXXFLAGS) $(MAPNIK_CXXFLAGS) $(PROTOBUF_CXXFLAGS) $(COMMON_FLAGS) $(MAPNIK_LDFLAGS) $(PROTOBUF_LDFLAGS) $(LDFLAGS) -Wno-unused-private-field
-test/test-cfg.h:
- echo "#define MAPNIK_PLUGINDIR \"$(MAPNIK_PLUGINDIR)\"" > test/test-cfg.h
-
-test: test/test-cfg.h test/run-test test/run-geom-test ./test/run-raster-test src/vector_tile.pb.cc test/catch.hpp
+test: test/run-test test/run-geom-test ./test/run-raster-test src/vector_tile.pb.cc test/catch.hpp
./test/run-test
./test/run-geom-test
./test/run-raster-test
./test/run-raster-test: Makefile src/vector_tile.pb.cc test/raster_tile.cpp test/encoding_util.hpp test/catch.hpp
- $(CXX) -o ./test/run-raster-test test/raster_tile.cpp src/vector_tile.pb.cc -I./src $(CXXFLAGS) $(MAPNIK_CXXFLAGS) $(PROTOBUF_CXXFLAGS) $(COMMON_FLAGS) $(MAPNIK_LDFLAGS) $(PROTOBUF_LDFLAGS) $(LDFLAGS) -Wno-unused-private-field
+ $(CXX) -o ./test/run-raster-test test/raster_tile.cpp src/vector_tile.pb.cc -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -I./src $(CXXFLAGS) $(MAPNIK_CXXFLAGS) $(PROTOBUF_CXXFLAGS) $(COMMON_FLAGS) $(MAPNIK_LDFLAGS) $(PROTOBUF_LDFLAGS) $(LDFLAGS) -Wno-unused-private-field
./test/run-raster-test
./test/run-geom-test: Makefile src/vector_tile.pb.cc test/geometry_encoding.cpp test/encoding_util.hpp src/vector_tile_geometry_encoder.hpp test/catch.hpp
@@ -54,6 +51,5 @@ clean:
@rm -f ./test/run-raster-test
@rm -f ./python/vector_tile_pb2.py
@rm -f ./python/*pyc
- @rm -f ./test/test-cfg.h
.PHONY: test
View
1 test/raster_tile.cpp
@@ -4,7 +4,6 @@
// test utils
#include "test_utils.hpp"
-#include "test-cfg.h"
#include "vector_tile_projection.hpp"

0 comments on commit 7209bde

Please sign in to comment.