summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-03-17 08:38:14 +0000
committerpaltherr <paltherr@epfl.ch>2003-03-17 08:38:14 +0000
commit7b6238d54b9d9c2104c9adbb13a4718ea74eb9c7 (patch)
tree17b0c73e36529e90b179df049d3e347e19daa631 /Makefile
parent82cd3d4d235aedd52d230d912a001cb089f30686 (diff)
downloadscala-7b6238d54b9d9c2104c9adbb13a4718ea74eb9c7.tar.gz
scala-7b6238d54b9d9c2104c9adbb13a4718ea74eb9c7.tar.bz2
scala-7b6238d54b9d9c2104c9adbb13a4718ea74eb9c7.zip
- Added java archive
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ba0668de19..bc24280b88 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,15 @@ PROJECT_CLASSPATH = $(PROJECT_OUTPUTDIR)
PROJECT_LISTDIR = $(PROJECT_ROOT)/config/list
PROJECT_SOURCEDIR = $(PROJECT_ROOT)/sources
+# project java archive
+
+PROJECT_JAR_ARCHIVE = $(ROOT)/lib/$(PROJECT_NAME).jar
+PROJECT_JAR_MANIFEST = $(PROJECT_SOURCEDIR)/MANIFEST
+PROJECT_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR)
+PROJECT_JAR_FILES += scala
+PROJECT_JAR_FILES += scalac
+PROJECT_JAR_FILES += scalai
+
# scala scripts wrapper
SCRIPTS_PREFIX = $(PROJECT_ROOT)/bin
SCRIPTS_WRAPPER_NAME = .scala_wrapper
@@ -206,6 +215,7 @@ $(TUPLE_FILES): $(TUPLE_TEMPLATE) $(TUPLE_RULES)
##############################################################################
include $(ROOT)/support/make/jc.mk
+include $(ROOT)/support/make/jar.mk
include $(ROOT)/support/make/exec.mk
include $(ROOT)/support/make/grep.mk
include $(ROOT)/support/make/wc.mk