Nice makefile

CubeControl/AFrame.java

@@ -21,7 +21,6 @@
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import java.util.ArrayList;
 import java.util.Arrays;
 
 /**

CubeControl/Animation.java

@@ -22,6 +22,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A collection of frames that represent an entire animation.
@@ -32,7 +33,7 @@ import java.util.ArrayList;
  */
 
 public class Animation {
-  ArrayList<AFrame> frames = new ArrayList<AFrame>();
+  List<AFrame> frames = new ArrayList<AFrame>();
   private int lastFrameIndex = 0;
   private String name = "Animation";
 

CubeControl/AnimationUtility.java

@@ -26,6 +26,7 @@ import java.io.File;
 import java.util.Scanner;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A helper class that loads animations from a file or saves them to one.
@@ -44,10 +45,9 @@ public class AnimationUtility {
    * @return Populated ArrayList
    * @throws Excpetion When something goes wrong with the Scanner...
    */
-  public static ArrayList<Animation> readFile(String path) throws Exception {
+  public static List<Animation> readFile(String path) throws Exception {
     Scanner sc = new Scanner(new File(path));
-  ArrayList<Animation> animations = new ArrayList<Animation>();
-
+  List<Animation> animations = new ArrayList<Animation>();
   do {
   Animation tmp = readAnimation(sc);
   if (tmp == null) {
@@ -68,7 +68,7 @@ public class AnimationUtility {
    * @param animations ArrayList with all animations to be saved
    * @see AnimationUtility#getLastError() getLastError()
    */
-  public static void writeFile(String path, ArrayList<Animation> animations) {
+  public static void writeFile(String path, List<Animation> animations) {
     File f = new File(path);
     if (f.exists()) {
       try {

CubeControl/cubeWorker.java

@@ -26,6 +26,7 @@
  * many animations, but has to be only 1Mbit in size (128*1024 Byte).
  */
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Collections;
 import java.util.StringTokenizer;
 
@@ -50,7 +51,7 @@ public class cubeWorker {
 // Fields
 // --------------------
 
-  private ArrayList<Animation> animations = new ArrayList<Animation>();
+  private List<Animation> animations = new ArrayList<Animation>();
   private int framesRemaining = 2016; // (128 * 1024) / 65 = 2016,...
   private boolean changedState = false;
 
@@ -71,7 +72,7 @@ public class cubeWorker {
    * Creates a worker from the given animation list
    * @param anims List of animations
    */
-  cubeWorker(ArrayList<Animation> anims) {
+  cubeWorker(List<Animation> anims) {
     animations = anims;
   }
 

CubeControl/makefile

@@ -1,10 +1,12 @@
 # Name of your C-Compiler
 CC = gcc
 # Path to jni.h
-HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
-
 ifdef SystemRoot
 HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
+$(RM) = del
+else
+HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
+$(RM) = rm -f
 endif
 
 # All java files to be compiled
@@ -14,8 +16,9 @@ JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java
 # Files that go in the jar
 INJAR = *.class *.png
 
+# --------------------------------------
 
-all: CubeControl.jar libSerial
+all: libSerial CubeControl.jar
 
 doc: doc/index.html
 
@@ -28,28 +31,24 @@ serialInterface.h: HelperUtility.class
 HelperUtility.class: $(JAVAFILES)
 	javac $(JAVAFILES)
 
-# SystemRoot is only defined in Windows
-ifdef SystemRoot
-libSerial: Serial.dll
-$(RM) = del
-else
-libSerial: libSerial.jnilib
-$(RM) = rm -f
-endif
-
 libSerial.jnilib: serialHelper.c helper/unixSerial.c serialInterface.h
 	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o
 	$(CC) -dynamiclib -o libSerial.jnilib serialHelper.o
-	rm -f serialHelper.o
 
 Serial.dll: serialHelper.c helper/winSerial.c serialInterface.h
 	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o -D winHelper
 	$(CC) -shared -o Serial.dll serialHelper.o
-	del serialHelper.o
 
 doc/index.html: $(JAVAFILES)
 	javadoc -d doc $(JAVAFILES)
 
+# SystemRoot is only defined in Windows
+ifdef SystemRoot
+libSerial: Serial.dll
+else
+libSerial: libSerial.jnilib
+endif
+
 # Delete intermediate files
 clean:
 	$(RM) *.class