diff options
| author | Colin Cross <ccross@android.com> | 2015-07-21 14:37:48 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-07-21 14:37:48 -0700 |
| commit | f479d54a50e287c4d287787f67e843f1be6a1936 (patch) | |
| tree | 1d3899174f497bbad4dde530339fa2e7d079249e /Makefile.ckati | |
| parent | 43767ff623cdbea24d46763ac694eaf8693b178f (diff) | |
| download | kati-f479d54a50e287c4d287787f67e843f1be6a1936.tar.gz | |
[C++] Namespace all the variables in Makefile.ckati with KATI_
Rename CXX_* in Makefile.ckati to KATI_CXX_* to avoid collisions
when including Makefile.ckati from the Android build.
Diffstat (limited to 'Makefile.ckati')
| -rw-r--r-- | Makefile.ckati | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/Makefile.ckati b/Makefile.ckati index a6a7a40..79be4d5 100644 --- a/Makefile.ckati +++ b/Makefile.ckati @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -CXX_SRCS:= \ +KATI_CXX ?= $(CXX) + +KATI_CXX_SRCS:= \ ast.cc \ command.cc \ dep.cc \ @@ -38,27 +40,27 @@ CXX_SRCS:= \ value.cc \ var.cc \ version.cc -CXX_TEST_SRCS:= \ +KATI_CXX_TEST_SRCS:= \ $(wildcard *_test.cc) -CXX_OBJS:=$(CXX_SRCS:.cc=.o) -CXX_TEST_OBJS:=$(CXX_TEST_SRCS:.cc=.o) -CXX_ALL_OBJS:=$(CXX_SRCS:.cc=.o) $(CXX_TEST_SRCS:.cc=.o) -CXX_TEST_EXES:=$(CXX_TEST_OBJS:.o=) -CXXFLAGS:=-g -W -Wall -MMD -CXXFLAGS+=-O -DNOLOG -#CXXFLAGS+=-pg +KATI_CXX_OBJS:=$(KATI_CXX_SRCS:.cc=.o) +KATI_CXX_TEST_OBJS:=$(KATI_CXX_TEST_SRCS:.cc=.o) +KATI_CXX_ALL_OBJS:=$(KATI_CXX_SRCS:.cc=.o) $(KATI_CXX_TEST_SRCS:.cc=.o) +KATI_CXX_TEST_EXES:=$(KATI_CXX_TEST_OBJS:.o=) +KATI_CXXFLAGS:=-g -W -Wall -MMD +KATI_CXXFLAGS+=-O -DNOLOG +#KATI_CXXFLAGS+=-pg -ckati: $(CXX_OBJS) - $(CXX) -std=c++11 $(CXXFLAGS) -o $@ $(CXX_OBJS) +ckati: $(KATI_CXX_OBJS) + $(KATI_CXX) -std=c++11 $(KATI_CXXFLAGS) -o $@ $(KATI_CXX_OBJS) -$(CXX_ALL_OBJS): %.o: %.cc - $(CXX) -c -std=c++11 $(CXXFLAGS) -o $@ $< +$(KATI_CXX_ALL_OBJS): %.o: %.cc + $(KATI_CXX) -c -std=c++11 $(KATI_CXXFLAGS) -o $@ $< -ckati_tests: $(CXX_TEST_EXES) +ckati_tests: $(KATI_CXX_TEST_EXES) -$(CXX_TEST_EXES): $(filter-out main.o,$(CXX_OBJS)) -$(CXX_TEST_EXES): %: %.o - $(CXX) $^ -o $@ +$(KATI_CXX_TEST_EXES): $(filter-out main.o,$(KATI_CXX_OBJS)) +$(KATI_CXX_TEST_EXES): %: %.o + $(KATI_CXX) $^ -o $@ version.cc: .git/HEAD .git/index echo '// +build ignore' > $@ @@ -66,7 +68,7 @@ version.cc: .git/HEAD .git/index echo 'const char* kGitVersion = "$(shell git rev-parse HEAD)";' >> $@ ckati_clean: - rm -rf ckati *.o *.d $(CXX_TEST_EXES) version.cc + rm -rf ckati *.o *.d $(KATI_CXX_TEST_EXES) version.cc .PHONY: ckati_clean |