Now with nicer makefiles, auto OS detection

Cube Control/makefile

@@ -1,76 +0,0 @@
-JAVAC = javac
-JAVADOC = javadoc
-JAVAH = javah
-DOCDIR = doc
-CC = gcc
-TARGET = unix
-#TARGET= cygwin
-#TARGET = win
-
-HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
-
-# Java files to be compiled
-# Needs to be a complete list so they work as target
-JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java
-
-ifeq ($(TARGET),unix)
-INJAR = *.class *.png
-RM = rm -f
-else
-INJAR = *.class *.png
-RM = del
-endif
-
-# Cygwin needs the .exe file, but the rm command!
-# Don't add a space after the comma. You get 'missing separator'...
-# Also add a space after 'ifeq', else you get 'missing separator'...
-ifeq ($(TARGET),cygwin)
-RM = rm
-endif
-
-# Spit out jar file, documentation, delete intermediate files
-all: build
-
-# Generate Documentation
-doc: doc/index.html
-
-# Compile java files
-java: Frame.class
-
-# Spit out jar file, dont remove anything after that
-build: Frame.class libSerial
-	jar -cmf manifest.txt "Cube Control.jar" $(INJAR)
-
-# Compile java files
-Frame.class: $(JAVAFILES)
-	$(JAVAC) $(JAVAFILES)
-
-doc/index.html: $(JAVAFILES)
-	$(JAVADOC) -d $(DOCDIR) $(JAVAFILES)
-
-# Compile serial Helper
-ifeq ($(TARGET),unix)
-libSerial: serialInterface.h serialHelper.c helper/unixSerial.c
-	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o
-	$(CC) -dynamiclib -o libSerial.jnilib serialHelper.o
-else
-libSerial: serialInterface.h serialHelper.c helper/winSerial.c
-	$(CC) -x c -I$(HEADERPATH) -c serialHelper.c -o serialHelper.o -D winHelper
-	$(CC) -dynamiclib -o libSerial.dll serialHelper.o
-endif
-
-serialInterface.h:
-	$(JAVAC) HelperUtility.java
-	$(JAVAH) -o serialInterface.h HelperUtility
-
-# Delete intermediate files
-clean:
-	$(RM) *.class
-	$(RM) *.h
-	$(RM) *.o
-	$(RM) *.jar
-ifeq ($(TARGET),unix)
-	$(RM) *.jnilib
-else
-	$(RM) *.dll
-endif

CubeControl/makefile

@@ -0,0 +1,59 @@
+# Name of your C-Compiler
+CC = gcc
+# Path to jni.h
+HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
+
+# All java files to be compiled
+# List so it works as target
+JAVAFILES = HelperUtility.java AnimationUtility.java Animation.java AFrame.java cubeWorker.java layerEditFrame.java Led3D.java Frame.java
+
+# Files that go in the jar
+INJAR = *.class *.png
+
+
+all: CubeControl.jar
+
+doc: doc/index.html
+
+CubeControl.jar: libSerial HelperUtility.class manifest.txt
+	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
+
+serialInterface.h: HelperUtility.class
+	javah -o serialInterface.h HelperUtility
+
+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) -dynamiclib -o Serial.dll serialHelper.o
+	del serialHelper.o
+
+doc/index.html: $(JAVAFILES)
+	javadoc -d doc $(JAVAFILES)
+
+# Delete intermediate files
+clean:
+	$(RM) *.class
+	$(RM) *.h
+	$(RM) *.o
+	$(RM) *.jar
+ifdef SystemRoot
+	$(RM) *.dll
+else
+	$(RM) *.jnilib
+endif

makefile

@@ -0,0 +1,27 @@
+all: Control Firmware
+
+Control:
+	make -C CubeControl
+	mv CubeControl/CubeControl.jar CubeControl.jar
+ifdef SystemRoot
+	mv CubeControl/Serial.dll Serial.dll
+else
+	mv CubeControl/libSerial.jnilib libSerial.jnilib
+endif
+	make -C CubeControl clean
+
+Firmware:
+	make -C CubeFirmware
+	mv CubeFirmware/main.hex CubeFirmware.hex
+	make -C CubeFirmware clean
+
+clean:
+ifdef SystemRoot
+	del CubeControl.jar
+	del CubeFirmware.hex
+	del Serial.dll
+else
+	rm -f CubeControl.jar
+	rm -f CubeFirmware.hex
+	rm -f libSerial.jnilib
+endif