package-info.java is ignored in makefiles

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

prism/src/dv/Makefile

@@ -24,7 +24,9 @@ LIBRARIES = \
 -ldd \
 $(LIBMATH)
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
+
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/explicit/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = explicit
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/hybrid/Makefile

@@ -27,7 +27,8 @@ LIBRARIES = \
 -lprism \
 $(LIBMATH)
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/jdd/Makefile

@@ -22,7 +22,8 @@ LIBRARIES = \
 -L$(PRISM_DIR_REL)/$(LIB_DIR) \
 -ldd
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/jltl2ba/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = jltl2ba
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/jltl2dstar/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = jltl2dstar
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/mtbdd/Makefile

@@ -25,7 +25,8 @@ LIBRARIES = \
 -lprism \
 $(LIBMATH)
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/odd/Makefile

@@ -22,7 +22,8 @@ LIBRARIES = \
 -L$(PRISM_DIR_REL)/$(LIB_DIR) \
 -ldd
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/parser/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = parser
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java ast/*.java type/*.java visitor/*.java)
+JAVA_FILES_ALL = $(wildcard *.java ast/*.java type/*.java visitor/*.java)
+JAVA_FILES = $(patsubst %package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/pepa/compiler/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = pepa/compiler
 PRISM_DIR_REL = ../../..
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/prism/Makefile

@@ -20,7 +20,8 @@ INCLUDES = \
 LIBRARIES = \
 $(LIBMATH)
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/pta/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = pta
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java parser/*.java)
+JAVA_FILES_ALL = $(wildcard *.java parser/*.java)
+JAVA_FILES = $(patsubst %package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/settings/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = settings
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 default: all

prism/src/simulator/Makefile

@@ -12,7 +12,8 @@
 THIS_DIR = simulator
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java sampler/*.java networking/*.java)
+JAVA_FILES_ALL = $(wildcard *.java sampler/*.java networking/*.java)
+JAVA_FILES = $(patsubst %package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 PRISM_CLASSPATH = "$(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR)$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/jcommon.jar$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/jfreechart.jar$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/epsgraphics.jar$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/colt.jar"

prism/src/sparse/Makefile

@@ -26,7 +26,8 @@ LIBRARIES = \
 -lprism \
 $(LIBMATH)
 
-JAVA_FILES = $(wildcard *.java)
+JAVA_FILES_ALL = $(wildcard *.java)
+JAVA_FILES = $(subst package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 CC_FILES = $(wildcard *.cc)

prism/src/userinterface/Makefile

@@ -10,7 +10,8 @@
 THIS_DIR = userinterface
 PRISM_DIR_REL = ../..
 
-JAVA_FILES = $(wildcard *.java graph/*.java model/*.java model/computation/*.java model/pepaModel/*.java model/graphicModel/*.java util/*.java simulator/*.java simulator/networking/*.java properties/*.java properties/computation/*.java log/*.java)
+JAVA_FILES_ALL = $(wildcard *.java graph/*.java model/*.java model/computation/*.java model/pepaModel/*.java model/graphicModel/*.java util/*.java simulator/*.java simulator/networking/*.java properties/*.java properties/computation/*.java log/*.java)
+JAVA_FILES = $(patsubst %package-info.java,,$(JAVA_FILES_ALL))
 CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)
 
 PRISM_CLASSPATH = "$(THIS_DIR)/$(PRISM_DIR_REL)/$(CLASSES_DIR)$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/jcommon.jar$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/jfreechart.jar$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/epsgraphics.jar$(CLASSPATHSEP)$(THIS_DIR)/$(PRISM_DIR_REL)/lib/colt.jar"