From b89d58dfa3887d561bd772421fb92ef01bd26fc4 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Wed, 7 Jan 2015 17:26:24 -0800 Subject: [PATCH] :%s/build_config/make_config Summary: I'm tired of double-tab when opening build_tools/. This change will make bu fully complete my path :) Test Plan: `vi bu` gives me `vi build_tools/` yay! Reviewers: yhchiang, rven, sdong Reviewed By: sdong Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D30639 --- .gitignore | 2 +- Makefile | 6 +++--- examples/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ccbb46b03..70316aebc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ TARGETS -build_config.mk +make_config.mk *.a *.arc diff --git a/Makefile b/Makefile index 9dab353e3..26dde6b45 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,9 @@ endif #----------------------------------------------- # detect what platform we're building on -$(shell (export ROCKSDB_ROOT="$(CURDIR)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/build_config.mk")) +$(shell (export ROCKSDB_ROOT="$(CURDIR)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) # this file is generated by the previous line to set build flags and sources -include build_config.mk +include make_config.mk ifneq ($(PLATFORM), IOS) CFLAGS += -g @@ -302,7 +302,7 @@ unity: unity.cc unity.o $(CXX) unity.o $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) clean: - -rm -f $(PROGRAMS) $(TESTS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) build_config.mk unity.cc + -rm -f $(PROGRAMS) $(TESTS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) make_config.mk unity.cc -rm -rf ios-x86/* ios-arm/* -find . -name "*.[oda]" -exec rm {} \; -find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \; diff --git a/examples/Makefile b/examples/Makefile index efc5fe30e..7bd88fbf0 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,4 +1,4 @@ -include ../build_config.mk +include ../make_config.mk .PHONY: clean