Adds HiPE compilation support, with "make hipe".

schwink · Aug 9, 2010 · 5ede796 · 5ede796
1 parent 9bb97b4
commit 5ede796
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/server/kanaloa/Makefile b/server/kanaloa/Makefile
@@ -9,12 +9,14 @@ all: ebin/
 	(cd src;$(MAKE) all)
 	(cd test;$(MAKE) all)
 
-force:
+# This requires the erlang-base-hipe package.
+hipe: ebin/
+	(cd src;$(MAKE) all native=true)
 
-doc: force
+doc:
 	(cd src;$(MAKE) edoc)
 
-test: force
+test: tbin/
 	(cd src;$(MAKE) test)
 
 clean:
@@ -30,6 +32,9 @@ dialyzer:
 ebin/:
 	@mkdir -p ebin
 
+tbin/:
+	@mkdir -p tbin
+
 install:
 	@mkdir -p $(DEST_EBIN) || true
 	cp ebin/* $(DEST_EBIN)
@@ -38,7 +43,7 @@ install:
 	@mkdir -p $(DEST_DOC) || true
 	cp doc/* $(DEST_DOC) || true
 
-package: force
+package:
 #	Increment the version number
 	dch  --newversion $(VERSION)-1-`date +"%Y%m%d%H%M%S"` "Local build"
 	dpkg-buildpackage -rfakeroot -b -uc -tc
diff --git a/server/kanaloa/support/include.mk b/server/kanaloa/support/include.mk
@@ -18,7 +18,9 @@ ifdef debug
   ERLC_FLAGS += -Ddebug
 endif
 
-# TODO: ERLC +native
+ifdef native
+  ERLC_FLAGS += +native
+endif
 
 EBIN_DIR := ../ebin
 TBIN_DIR := ../tbin
@@ -42,7 +44,6 @@ $(EBIN_DIR)/%.$(EMULATOR): %.erl
 	$(ERLC) $(ERLC_FLAGS) -o $(EBIN_DIR) $<
 
 $(TBIN_DIR)/%.$(EMULATOR): %.erl
-	@mkdir -p $(TBIN_DIR) || true
 	$(ERLC) $(ERLC_FLAGS) -o $(TBIN_DIR) $<
 
 ./%.$(EMULATOR): %.erl