Changeset 859

Timestamp:

Dec 2, 2008, 9:31:29 PM (13 years ago)

Author:

Peter Johansson

Message:

adding tests for javac and jar - refs #153

File:

• plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am (modified) (5 diffs)

plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2007 Peter Johansson
-# Copyright (C) 2008 Jari Häkkinen
+# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
 #
 # This file is part of WeNNI,
@@ -29 +29 @@
 JAVA = WeNNI.java 
 CLASS = $(JAVA:.java=.class)
-JAR  = WeNNI.jar
+WeNNI  = WeNNI.jar
 
 if DOWNLOADBASEAPI
@@ -35 +35 @@
 endif
 
-all-local: $(JAR)
+all-local: $(WeNNI)
 
 clean-local:; @( rm -rf *.jar *.class *~ $(TOPBUILDDIR)) 
@@ -42 +42 @@
   @( rm -rf $(DOWNLOADDEP) $(PLUGINutilities) $(PLUGINutilities).tgz )
 
-install-exec-local: $(JAR)
+install-exec-local: $(WeNNI)
   @$(NORMAL_INSTALL)
   test -z "$(bindir)" || $(MKDIR_P) "$(bindir)"
-  $(INSTALL) "$(JAR)" "$(bindir)"
+  $(INSTALL) "$(WeNNI)" "$(bindir)"
   $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(bindir)"
 
-install-plugin: $(JAR)
+install-plugin: $(WeNNI)
   @$(NORMAL_INSTALL)
   test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
-  $(INSTALL) "$(JAR)" "$(PLUGINDIR)"
+  $(INSTALL) "$(WeNNI)" "$(PLUGINDIR)"
   $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(PLUGINDIR)"
 
-$(JAR): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest
-  @echo Creating $(JAR)
-  @(cd $(TOPBUILDDIR) ; jar cf ../$(JAR) .)
+$(WeNNI): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest
+  @echo Creating $(WeNNI)
+  @(cd $(TOPBUILDDIR) ; $(JAR) cf ../$(WeNNI) .)
 
 manifest: $(TOPBUILDDIR)
@@ -67 +67 @@
 
 $(CLASS): $(BUILDDIR)/$(JAVA)
-  javac -cp $(JAVACFLAGS):$(TOPBUILDDIR)  $<
+  $(JAVAC) -cp $(JAVACFLAGS):$(TOPBUILDDIR)  $<
 
 $(BUILDDIR):