Skip to content

Commit

Permalink
[Fix] Fix sigma build
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mwilliams authored and macvicar committed Apr 6, 2011
1 parent 4fd120c commit 90e1de7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/ffi/java/Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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)

0 comments on commit 90e1de7

Please sign in to comment.