diff --git a/prism/Makefile b/prism/Makefile
index e6acbf15..c39bbd10 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -127,11 +127,11 @@ JAVA_DIR_BACKUP = $(shell \
 # Compilers etc. #
 ##################
 
-CC = gcc
-CXX = g++
-LD = $(CXX)
-JAVAC = javac
-JAVACC = javacc
+export CC = gcc
+export CXX = g++
+export LD = $(CXX)
+export JAVAC = javac
+export JAVACC = javacc
 
 ##############
 # Flags etc. #
@@ -320,8 +320,7 @@ cuddpackage: checks
 	@(if [ ! -h $(CUDD_DIR) ]; then \
 	  echo Making cudd ...; \
 	  cd $(CUDD_DIR) && \
-	  $(MAKE) CC="$(CC)" CXX="$(CXX)" \
-	  XCFLAGS="$(CUDD_XCFLAGS)"; \
+	  $(MAKE) XCFLAGS="$(CUDD_XCFLAGS)"; \
 	else \
 	  echo Skipping cudd make since it is a symlink...; \
 	fi)
@@ -330,8 +329,7 @@ cuddpackage: checks
 cuddpackageforce: checks
 	  @echo Making cudd ...; \
 	  cd $(CUDD_DIR) && \
-	  $(MAKE) CC="$(CC)" CXX="$(CXX)" \
-	  XCFLAGS="$(CUDD_XCFLAGS)";
+	  $(MAKE) XCFLAGS="$(CUDD_XCFLAGS)";
 
 # Use this to force a rebuild (with javacc) of the main parser
 parser:
@@ -339,8 +337,7 @@ parser:
 	cd src/parser && \
 	$(MAKE) touch && \
 	$(MAKE) \
-	JAVAC="$(JAVAC) $(JFLAGS)" \
-	JAVACC="$(JAVACC)" \
+	JFLAGS="$(JFLAGS)" \
 	CLASSPATHSEP="$(CLASSPATHSEP)"
 
 # Build various external libraries needed by PRISM
@@ -351,9 +348,6 @@ extpackages: checks
 	  $(MAKE) \
 	  OSTYPE="$(OSTYPE)" \
 	  ARCH="$(ARCH)" \
-	  CC="$(CC)" \
-	  CXX="$(CXX)" \
-	  LD="$(LD)" \
 	  CFLAGS="$(CFLAGS)" \
 	  CXXFLAGS="$(CXXFLAGS)" \
 	  LDFLAGS="$(LDFLAGS)" \
@@ -383,11 +377,7 @@ make_dirs:
 	  JAVA_INCLUDES="$(JAVA_INCLUDES)" \
 	  JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" \
 	  JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" \
-	  CC="$(CC)" \
-	  CXX="$(CXX)" \
-	  LD="$(LD)" \
-	  JAVAC="$(JAVAC) $(JFLAGS)" \
-	  JAVACC="$(JAVACC)" \
+	  JFLAGS="$(JFLAGS)" \
 	  CFLAGS="$(CFLAGS)" \
 	  CXXFLAGS="$(CXXFLAGS)" \
 	  LDFLAGS="$(LDFLAGS)" \
diff --git a/prism/src/automata/Makefile b/prism/src/automata/Makefile
index e641d238..92937561 100644
--- a/prism/src/automata/Makefile
+++ b/prism/src/automata/Makefile
@@ -34,7 +34,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/cex/Makefile b/prism/src/cex/Makefile
index 3db9369e..9df09d01 100644
--- a/prism/src/cex/Makefile
+++ b/prism/src/cex/Makefile
@@ -34,7 +34,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/common/Makefile b/prism/src/common/Makefile
index f9a6e58d..d5873a1e 100644
--- a/prism/src/common/Makefile
+++ b/prism/src/common/Makefile
@@ -34,7 +34,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/dv/Makefile b/prism/src/dv/Makefile
index 3b1f9c73..90bdcd97 100644
--- a/prism/src/dv/Makefile
+++ b/prism/src/dv/Makefile
@@ -49,7 +49,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dv$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/explicit/Makefile b/prism/src/explicit/Makefile
index 2a6fd768..a6d6e224 100644
--- a/prism/src/explicit/Makefile
+++ b/prism/src/explicit/Makefile
@@ -32,7 +32,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/hybrid/Makefile b/prism/src/hybrid/Makefile
index d63a9879..0b175e6a 100644
--- a/prism/src/hybrid/Makefile
+++ b/prism/src/hybrid/Makefile
@@ -52,7 +52,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismhybrid$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/jdd/Makefile b/prism/src/jdd/Makefile
index e7050929..61080370 100644
--- a/prism/src/jdd/Makefile
+++ b/prism/src/jdd/Makefile
@@ -47,7 +47,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)jdd$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/jltl2ba/Makefile b/prism/src/jltl2ba/Makefile
index fcd8cc7b..9581b357 100644
--- a/prism/src/jltl2ba/Makefile
+++ b/prism/src/jltl2ba/Makefile
@@ -32,7 +32,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/jltl2dstar/Makefile b/prism/src/jltl2dstar/Makefile
index 7682d464..7a56d817 100644
--- a/prism/src/jltl2dstar/Makefile
+++ b/prism/src/jltl2dstar/Makefile
@@ -32,7 +32,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/mtbdd/Makefile b/prism/src/mtbdd/Makefile
index ab6ee5ca..2c34522a 100644
--- a/prism/src/mtbdd/Makefile
+++ b/prism/src/mtbdd/Makefile
@@ -51,7 +51,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismmtbdd$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/odd/Makefile b/prism/src/odd/Makefile
index 85a503e0..13d2c79d 100644
--- a/prism/src/odd/Makefile
+++ b/prism/src/odd/Makefile
@@ -47,7 +47,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)odd$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/param/Makefile b/prism/src/param/Makefile
index 6187e1f6..0b22ecdc 100644
--- a/prism/src/param/Makefile
+++ b/prism/src/param/Makefile
@@ -33,7 +33,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/parser/Makefile b/prism/src/parser/Makefile
index e334bcf5..154711b0 100644
--- a/prism/src/parser/Makefile
+++ b/prism/src/parser/Makefile
@@ -38,7 +38,7 @@ Prism3To4.java: Prism3To4.jj
 	$(JAVACC) $< || echo "Warning: Did not recompile Prism3To4.jj"
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/pepa/compiler/Makefile b/prism/src/pepa/compiler/Makefile
index f4288f24..39b28603 100644
--- a/prism/src/pepa/compiler/Makefile
+++ b/prism/src/pepa/compiler/Makefile
@@ -32,7 +32,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ../..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ../..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/prism/Makefile b/prism/src/prism/Makefile
index bddd23f3..c7182dad 100644
--- a/prism/src/prism/Makefile
+++ b/prism/src/prism/Makefile
@@ -45,7 +45,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/pta/Makefile b/prism/src/pta/Makefile
index 008ac071..25e2a86e 100644
--- a/prism/src/pta/Makefile
+++ b/prism/src/pta/Makefile
@@ -35,7 +35,7 @@ parser/PTAParser.java: parser/PTAParser.jj
 	@(cd parser; $(JAVACC) PTAParser.jj || echo "Warning: Did not recompile $<")
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/settings/Makefile b/prism/src/settings/Makefile
index cba11e22..6713e7bc 100644
--- a/prism/src/settings/Makefile
+++ b/prism/src/settings/Makefile
@@ -32,7 +32,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/simulator/Makefile b/prism/src/simulator/Makefile
index fbc3bed4..8f9ded7d 100644
--- a/prism/src/simulator/Makefile
+++ b/prism/src/simulator/Makefile
@@ -34,7 +34,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)simengine$(LIBSUFFIX) $(O_FILES)
diff --git a/prism/src/sparse/Makefile b/prism/src/sparse/Makefile
index ef26a51a..598e8602 100644
--- a/prism/src/sparse/Makefile
+++ b/prism/src/sparse/Makefile
@@ -53,7 +53,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismsparse$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
diff --git a/prism/src/strat/Makefile b/prism/src/strat/Makefile
index 3dc800bf..c6c8630c 100644
--- a/prism/src/strat/Makefile
+++ b/prism/src/strat/Makefile
@@ -34,7 +34,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
 
 clean: checks
 	@rm -f $(CLASS_FILES)
diff --git a/prism/src/userinterface/Makefile b/prism/src/userinterface/Makefile
index 7add9b8b..cdd67ef1 100644
--- a/prism/src/userinterface/Makefile
+++ b/prism/src/userinterface/Makefile
@@ -32,7 +32,7 @@ checks:
 	fi; 
 
 $(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
-	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
+	(cd ..; $(JAVAC) $(JFLAGS) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_SRC_DIR) -classpath $(PRISM_CLASSPATH) -h $(JNI_GEN_HEADER_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(PRISM_CLASSES_DIR) $(THIS_DIR)/$<)
  
 clean: checks
 	@rm -f $(CLASS_FILES)