From 90e1de7804fbfeae5a22b9c63c970a5dddaa1620 Mon Sep 17 00:00:00 2001 From: mwilliams Date: Tue, 5 Apr 2011 10:29:37 -0700 Subject: [PATCH] [Fix] Fix sigma build Summary: sigma build seems to be ignoring the dependency "${HEADER} : ${CLS}" I've never seen ${} used as makefile syntax before, but it seems to work for me. But changing it to $() to see if thats the issue. Also changing the definitions of CLS and SRC to avoid executing those shell commands multiple times. Reviewed By: kma Reviewers: kma CC: stein, astrehl, kma Revert Plan: OK Differential Revision: 233127 --- src/ffi/java/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ffi/java/Makefile b/src/ffi/java/Makefile index 47d834a4d5b96..2f0f2daf01ffe 100644 --- a/src/ffi/java/Makefile +++ b/src/ffi/java/Makefile @@ -2,9 +2,9 @@ PROJECT_ROOT = ../../.. PROJECT_NAME = hphp_java -SRC = $(shell echo `find hphp -name '*.java'`) +SRC := $(shell find hphp -name '*.java') -CLS = $(shell echo $(patsubst %.java, %.class, $(SRC)) \ +CLS := $(shell echo $(patsubst %.java, %.class, $(SRC)) \ | sed -e "s/hphp/classes\/hphp/g") HEADER = hphp_ffi_java.h @@ -34,9 +34,9 @@ $(CLS) : $(SRC) $(V)mkdir -p classes $(V)$(JAVA_PATH)/bin/javac -sourcepath . -d classes $^ -${HEADER} : ${CLS} - $(V)$(JAVA_PATH)/bin/javah -classpath classes -o ${HEADER} \ - `echo ${CLS} | sed -e 's/classes\///g' -e 's/\.class//g' -e 's/\//\./g'` +$(HEADER) : $(CLS) + $(V)$(JAVA_PATH)/bin/javah -classpath classes -o $(HEADER) \ + `echo $(CLS) | sed -e 's/classes\///g' -e 's/\.class//g' -e 's/\//\./g'` clobber : clean $(V)rm -rf $(SHARED_LIB) classes $(HEADER)