From 0ac4b76be23204da3a27a5e4b54c681c7c4bf8ee Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Tue, 21 Jun 2016 10:29:13 -0700
Subject: [PATCH] do not use the FB-ONLY literal string in non-fb-only files

Reviewed By: jberdine

Differential Revision: D3399011

fbshipit-source-id: cb2558c
---
 .gitignore         |  1 +
 Makefile           | 12 ++++++++++++
 Makefile.config.in | 11 ++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f0850642..6c37fbb88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ _build
 /configure
 /Makefile.config
 /.buckversion
+/*/.gitignore
 
 # IntelliJ files
 /scripts/.idea/
diff --git a/Makefile b/Makefile
index 62d3b938e..369a36f0c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,9 @@ $(INFER_BIN_RELPATH) $(INFERTRACEBUGS_BIN_RELPATH):
 	 $(LN_S) ../lib/python/$(@F) $(@F))
 
 src_build:
+ifeq ($(IS_FACEBOOK_TREE),yes)
+	$(MAKE) -C facebook
+endif
 	$(MAKE) -C $(SRC_DIR) infer
 ifeq ($(BUILD_C_ANALYZERS),yes)
 src_build: clang_plugin
@@ -67,10 +70,16 @@ endif
 inferTraceBugs: $(INFERTRACEBUGS_BIN_RELPATH)
 
 test_this_build: clang_plugin
+ifeq ($(IS_FACEBOOK_TREE),yes)
+	$(MAKE) -C facebook
+endif
 	$(MAKE) -C $(SRC_DIR) test_build
 
 test_oss_build: clang_plugin
 # make sure we don't break the opensource build
+ifeq ($(IS_FACEBOOK_TREE),yes)
+	$(MAKE) -C facebook clean
+endif
 	$(MAKE) -C $(SRC_DIR) EXTRA_DEPS=opensource LLVM_BUILD_DIR=$(BUILD_DIR)/llvm_opensource TEST_BUILD_DIR=$(BUILD_DIR)/opensource test_build
 
 test_build: test_this_build
@@ -230,6 +239,9 @@ endif
 	$(MAKE) -C $(ANNOTATIONS_DIR) clean
 	$(MAKE) -C $(MODELS_DIR) clean
 	$(REMOVE) $(INFER_BIN_RELPATH) $(INFERTRACEBUGS_BIN_RELPATH)
+ifeq ($(IS_FACEBOOK_TREE),yes)
+	$(MAKE) -C facebook clean
+endif
 
 conf-clean: clean
 	$(REMOVE) infer/lib/python/inferlib/*.pyc
diff --git a/Makefile.config.in b/Makefile.config.in
index de7be4c04..d0ecf6868 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -35,7 +35,6 @@ IS_RELEASE_TREE = @IS_RELEASE_TREE@
 LDFLAGS = @LDFLAGS@
 libdir = @libdir@
 LIBS = @LIBS@
-LN_S = @LN_S@
 MKDIR_P_CMD = case "@MKDIR_P@" in \
     ./*) printf "$(ROOT_DIR)/@MKDIR_P@\n";; \
     *) printf "@MKDIR_P@\n";; \
@@ -47,22 +46,28 @@ USER_JAVA_HOME = @USER_JAVA_HOME@
 XCODE_SELECT = @XCODE_SELECT@
 
 ifneq (,$(findstring s,$(MAKEFLAGS)))
+# quiet mode
+LN_S = @LN_S@
 REMOVE = rm -f
 REMOVE_DIR = rm -rf
+RSYNC_A = rsync -av
 else
+LN_S = @LN_S@ -v
 REMOVE = rm -vf
 REMOVE_DIR = rm -rvf
+RSYNC_A = rsync -aq
 endif
 COPY = cp -f -p
 COPY_DIR = cp -Rf
 
 ABSOLUTE_ROOT_DIR = $(shell cd $(ROOT_DIR) && pwd)
 
+DEPENDENCIES_DIR = $(ABSOLUTE_ROOT_DIR)/dependencies
+DOCKER_DIR = $(ABSOLUTE_ROOT_DIR)/docker
 EXAMPLES_DIR = $(ABSOLUTE_ROOT_DIR)/examples
-FCP_DIR = $(ABSOLUTE_ROOT_DIR)/facebook-clang-plugins
 INFER_DIR = $(ABSOLUTE_ROOT_DIR)/infer
-DEPENDENCIES_DIR = $(ABSOLUTE_ROOT_DIR)/dependencies
 FCP_DIR = $(ABSOLUTE_ROOT_DIR)/facebook-clang-plugins
+M4_DIR = $(ABSOLUTE_ROOT_DIR)/m4
 SCRIPT_DIR = $(ABSOLUTE_ROOT_DIR)/scripts
 
 FCP_CLANG_OCAML_DIR = $(FCP_DIR)/clang-ocaml