From 1d0f57cbceb778139ca215cc4fcfd1584951f6dd Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 22 Nov 2006 08:41:20 +0000
Subject: Merged stone_soup r15:451 into trunk.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/makefile | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'crawl-ref/source/makefile')

diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index 1f7dac1cb0..74adf5d88c 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -4,19 +4,20 @@
 
 #Makefile chooser.  Choose one:
 
-#MAKEFILE = makefile.lnx
-#MAKEFILE = makefile.sgi
+MAKEFILE = makefile.unix
 #MAKEFILE = makefile.dos
-#MAKEFILE = makefile.emx
-#MAKEFILE = makefile.sol
-MAKEFILE = makefile.osx
+#MAKEFILE = makefile.osx
+#MAKEFILE = makefile.mgw
 
 #jmf: number of concurrent jobs -- good value is (#_of_CPUs * 2) + 1
 #     cuts build time a lot on multi-cpu machines
 #OTHER=-j2
 
 all:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) EXTRA_FLAGS='-O2 -fno-strength-reduce'
+	$(MAKE) $(OTHER) -f $(MAKEFILE) EXTRA_FLAGS='-O3'
+
+profile:
+	$(MAKE) $(OTHER) -f $(MAKEFILE) EXTRA_FLAGS='-O3 -pg'
 
 noopt:
 	$(MAKE) $(OTHER) -f $(MAKEFILE)
@@ -36,7 +37,15 @@ wizard:
 
 # DEBUG mode includes WIZARD mode as well as copious debugging input
 debug:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) debug EXTRA_FLAGS='-g -DFULLDEBUG -DWIZARD'
+	$(MAKE) $(OTHER) -f $(MAKEFILE) DEBUG_CRAWL=y debug EXTRA_FLAGS='-g -DFULLDEBUG -DWIZARD'
+
+# [dshaligram] The individual makefile need not necessarily support 
+# package-source; only makefile.unix does at the moment.
+package-source:
+	$(MAKE) -f $(MAKEFILE) package-source
+
+prebuildyacc:
+	$(MAKE) -f $(MAKEFILE) prebuildyacc
 
 # DO NOT DELETE THIS LINE -- $(MAKE) depend depends on it.
 
-- 
cgit v1.2.3-54-g00ecf