summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-04-16 15:17:39 +0000
committerpaltherr <paltherr@epfl.ch>2003-04-16 15:17:39 +0000
commit28cbd95ca3352489fecbdd8743da6556b8be6b57 (patch)
treea05c398a17bdc2c1755813e03ddaad6085ddebb4 /Makefile
parenta5aa3c8f66faeb1d7d269d72b474fdddf8c6aa48 (diff)
downloadscala-28cbd95ca3352489fecbdd8743da6556b8be6b57.tar.gz
scala-28cbd95ca3352489fecbdd8743da6556b8be6b57.tar.bz2
scala-28cbd95ca3352489fecbdd8743da6556b8be6b57.zip
- Updated rules to build Tuple files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e3f32ef278..88af8292e6 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,7 @@ FUNCTION_TEMPLATE = $(FUNCTION_PREFIX)/Function.java.tmpl
TUPLE_PREFIX = $(LIBRARY_ROOT)
TUPLE_FILES += $(filter $(TUPLE_PREFIX)/Tuple%.scala,$(LIBRARY_FILES))
-TUPLE_TEMPLATE = $(TUPLE_PREFIX)/Tuple.tmpl
-TUPLE_RULES = $(TUPLE_PREFIX)/Tuple.scm
+TUPLE_TEMPLATE = $(TUPLE_PREFIX)/Tuple.scala.tmpl
# meta programming
META_ROOT = $(PROJECT_SOURCEDIR)/meta
@@ -199,7 +198,6 @@ clean : fastclean
distclean : clean
$(RM) .latest-*
- $(RM) $(TUPLE_FILES)
$(RM) $(SCRIPTS_WRAPPER_LINKS)
$(RM) -r $(PROJECT_OUTPUTDIR)
$(RM) $(PROJECT_JAR_ARCHIVE)
@@ -279,8 +277,9 @@ $(FUNCTION_FILES) : .latest-meta $(FUNCTION_TEMPLATE)
$(RM) .latest-generate
@$(make) generate
-$(TUPLE_FILES): $(TUPLE_TEMPLATE) $(TUPLE_RULES)
- $(TEMPLATE_EXPANDER) $(TUPLE_RULES) $(TUPLE_TEMPLATE) $@
+$(TUPLE_FILES) : .latest-meta $(TUPLE_TEMPLATE)
+ $(RM) .latest-generate
+ @$(make) generate
% : .latest-meta %.tmpl
$(RM) .latest-generate