In prism/Makefie

Added compiler flags for the Java compiler via a new alias JFLAGS. Note, that unlike the other compiler flags (e.g. CFLAGS) JFLAGS are applied by changing the the alias JAVAC="$(JAVAC) $(JFLAGS)" not by adding the flags alias to each call to the given compiler in called makefiles.
Added JFLAGS entries to build paths for all OS types (empty entries).
Added '-encoding UFT8' option to JFLAGS of CYGWIN build path 
Added JAVACC compiler alias set by default to 'javacc'
Added simple check for javacc compiler in the users path. 
Set JAVACC compiler name to 'javacc.bat' in the case of CYGWIN builds

In prism/src/parser/Makefile and prism/src/pta/Makefile 
Changed calls to javacc to instead dereference the JAVACC alias


git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2098 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/Makefile

@@ -113,6 +113,7 @@ C = gcc
 CPP = g++
 LD = $(CPP)
 JAVAC = javac
+JAVACC = javacc
 JAVAH = javah
 
 ##############
@@ -156,6 +157,7 @@ ifeq ($(OSTYPE),linux)
 		CUDD_XCFLAGS = -m32 -mtune=native -malign-double -DHAVE_IEEE_754 -DBSD
 	endif
 	endif
+	JFLAGS =
 	SHARED = -shared
 	#SHARED = -G
 	EXE =
@@ -171,6 +173,7 @@ ifeq ($(OSTYPE),solaris)
 	CPPFLAGS = $(DEBUG) $(OPTIMISE)
 	LDFLAGS = $(DEBUG) $(OPTIMISE)
 	CUDD_XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN
+	JFLAGS =
 	SHARED = -shared -mimpure-text
 	EXE =
 	LIBPREFIX = lib
@@ -185,6 +188,8 @@ ifeq ($(OSTYPE),cygwin)
 	CPPFLAGS = -mno-cygwin $(DEBUG) $(OPTIMISE)
 	LDFLAGS = -mno-cygwin -Wl,--add-stdcall-alias $(DEBUG) $(OPTIMISE)
 	CUDD_XCFLAGS = -mno-cygwin -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0
+	JFLAGS = -encoding UTF8
+	JAVACC = javacc.bat
 	SHARED = -shared
 	#SHARED = -G
 	EXE = .exe
@@ -207,6 +212,7 @@ ifeq ($(OSTYPE),darwin)
 		LDFLAGS = -arch i386 -Wl,-search_paths_first $(DEBUG) $(OPTIMISE)
 		CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common
 	endif
+	JFLAGS =
 	SHARED = -dynamiclib
 	EXE =
 	LIBPREFIX = lib
@@ -325,7 +331,8 @@ make_dirs:
 	  C="$(C)" \
 	  CPP="$(CPP)" \
 	  LD="$(LD)" \
-	  JAVAC="$(JAVAC)" \
+	  JAVAC="$(JAVAC) $(JFLAGS)" \
+	  JAVACC="$(JAVACC)" \
 	  JAVAH="$(JAVAH)" \
 	  CFLAGS="$(CFLAGS)" \
 	  CPPFLAGS="$(CPPFLAGS)" \
@@ -522,7 +529,8 @@ checks:
 	fi; \
 	echo "OSTYPE/ARCH: $(OSTYPE) $(ARCH)"; \
 	echo "JAVA_DIR: $(JAVA_DIR)"; \
-	echo "JAVAC: "`which $(JAVAC)` \
+	echo "JAVAC: "`which $(JAVAC)`; \
+	echo "JAVACC: "`which $(JAVACC)` \
 	)
 
 #################################################

prism/src/parser/Makefile

@@ -24,10 +24,10 @@ checks:
 	fi; 
 
 PrismParser.java: PrismParser.jj
-	@javacc $< || echo "Warning: Did not recompile PrismParser.jj"
+	$(JAVACC) $< || echo "Warning: Did not recompile PrismParser.jj"
 
 Prism3To4.java: Prism3To4.jj
-	@javacc $< || echo "Warning: Did not recompile Prism3To4.jj"
+	$(JAVACC) $< || echo "Warning: Did not recompile Prism3To4.jj"
 
 $(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
 	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(SRC_DIR) -classpath $(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR) $(THIS_DIR)/$<)

prism/src/pta/Makefile

@@ -24,7 +24,7 @@ checks:
 	fi; 
 
 parser/PTAParser.java: parser/PTAParser.jj
-	@(cd parser; javacc PTAParser.jj || echo "Warning: Did not recompile $<")
+	@(cd parser; $(JAVACC) PTAParser.jj || echo "Warning: Did not recompile $<")
 
 $(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class: %.java
 	(cd ..; $(JAVAC) -sourcepath $(THIS_DIR)/$(PRISM_DIR_REL)/$(SRC_DIR) -classpath $(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR) -d $(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR) $(THIS_DIR)/$<)