Browse Source

Fixed makefile

Thomas Buck 12 years ago
parent
commit
8440b4adf6
1 changed files with 13 additions and 13 deletions
  1. 13
    13
      Cube Control/makefile

+ 13
- 13
Cube Control/makefile View File

@@ -2,9 +2,9 @@ JAVAC = javac
2 2
 JAVADOC = javadoc
3 3
 DOCDIR = doc
4 4
 CC = gcc
5
-#TARGET = unix
5
+TARGET = unix
6 6
 #TARGET= cygwin
7
-TARGET = win
7
+#TARGET = win
8 8
 
9 9
 # Java files to be compiled
10 10
 # Needs to be a complete list so they work as target
@@ -18,11 +18,12 @@ INJAR = *.class *.png serialHelper.exe splash.jpg
18 18
 RM = del
19 19
 endif
20 20
 
21
-#I always get 'missing separator', can somebody fix this?
22
-#Cygwin needs the .exe file, but the rm command!
23
-#ifeq($(TARGET), cygwin)
24
-#RM = rm
25
-#endif
21
+# Cygwin needs the .exe file, but the rm command!
22
+# Don't add a space after the comma. You get 'missing separator'...
23
+# Also add a space after 'ifeq', else you get 'missing separator'...
24
+ifeq ($(TARGET),cygwin)
25
+RM = rm
26
+endif
26 27
 
27 28
 # Spit out jar file, documentation, delete intermediate files
28 29
 all: build doc clean
@@ -31,14 +32,14 @@ all: build doc clean
31 32
 doc: doc/index.html
32 33
 
33 34
 # Compile java files
34
-java: frame.class
35
+java: Frame.class
35 36
 
36 37
 # Spit out jar file, dont remove anything after that
37
-build: frame.class serialHelper
38
+build: Frame.class serialHelper
38 39
 	jar -cmf manifest.txt "Cube Control.jar" $(INJAR)
39 40
 
40 41
 # Compile java files
41
-frame.class: $(JAVAFILES)
42
+Frame.class: $(JAVAFILES)
42 43
 	$(JAVAC) $(JAVAFILES)
43 44
 
44 45
 doc/index.html: $(JAVAFILES)
@@ -55,10 +56,9 @@ endif
55 56
 
56 57
 # Delete intermediate files
57 58
 clean:
59
+	$(RM) *.class
58 60
 ifeq ($(TARGET),unix)
59
-	$(RM) -f *.class
60
-	$(RM) -f serialHelper
61
+	$(RM) serialHelper
61 62
 else
62
-	$(RM) *.class
63 63
 	$(RM) serialHelper.exe
64 64
 endif

Loading…
Cancel
Save