From e3f6e64e7abea1f0ff8cc65a634e531e822273d5 Mon Sep 17 00:00:00 2001 From: Vojtech Forejt Date: Wed, 11 Jan 2012 19:29:20 +0000 Subject: [PATCH] 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 | 4 +++- prism/src/explicit/Makefile | 3 ++- prism/src/hybrid/Makefile | 3 ++- prism/src/jdd/Makefile | 3 ++- prism/src/jltl2ba/Makefile | 3 ++- prism/src/jltl2dstar/Makefile | 3 ++- prism/src/mtbdd/Makefile | 3 ++- prism/src/odd/Makefile | 3 ++- prism/src/parser/Makefile | 3 ++- prism/src/pepa/compiler/Makefile | 3 ++- prism/src/prism/Makefile | 3 ++- prism/src/pta/Makefile | 3 ++- prism/src/settings/Makefile | 3 ++- prism/src/simulator/Makefile | 3 ++- prism/src/sparse/Makefile | 3 ++- prism/src/userinterface/Makefile | 3 ++- 16 files changed, 33 insertions(+), 16 deletions(-) diff --git a/prism/src/dv/Makefile b/prism/src/dv/Makefile index d9a12176..912a9dfc 100644 --- a/prism/src/dv/Makefile +++ b/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) diff --git a/prism/src/explicit/Makefile b/prism/src/explicit/Makefile index 25f587d4..5aee710b 100644 --- a/prism/src/explicit/Makefile +++ b/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 diff --git a/prism/src/hybrid/Makefile b/prism/src/hybrid/Makefile index 300c2ae1..acfae8b2 100644 --- a/prism/src/hybrid/Makefile +++ b/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) diff --git a/prism/src/jdd/Makefile b/prism/src/jdd/Makefile index 6b5b044b..ab227235 100644 --- a/prism/src/jdd/Makefile +++ b/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) diff --git a/prism/src/jltl2ba/Makefile b/prism/src/jltl2ba/Makefile index ef88bee8..7e98137c 100644 --- a/prism/src/jltl2ba/Makefile +++ b/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 diff --git a/prism/src/jltl2dstar/Makefile b/prism/src/jltl2dstar/Makefile index 1fa51687..6ccce7a6 100644 --- a/prism/src/jltl2dstar/Makefile +++ b/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 diff --git a/prism/src/mtbdd/Makefile b/prism/src/mtbdd/Makefile index 298ffe40..a20e083a 100644 --- a/prism/src/mtbdd/Makefile +++ b/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) diff --git a/prism/src/odd/Makefile b/prism/src/odd/Makefile index 85ef17f2..c2246c1a 100644 --- a/prism/src/odd/Makefile +++ b/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) diff --git a/prism/src/parser/Makefile b/prism/src/parser/Makefile index 0c9aca52..b4f85e27 100644 --- a/prism/src/parser/Makefile +++ b/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 diff --git a/prism/src/pepa/compiler/Makefile b/prism/src/pepa/compiler/Makefile index 762751c6..3eea3356 100644 --- a/prism/src/pepa/compiler/Makefile +++ b/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 diff --git a/prism/src/prism/Makefile b/prism/src/prism/Makefile index 78918c5a..cb537c83 100644 --- a/prism/src/prism/Makefile +++ b/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) diff --git a/prism/src/pta/Makefile b/prism/src/pta/Makefile index e12712d0..b735cec7 100644 --- a/prism/src/pta/Makefile +++ b/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 diff --git a/prism/src/settings/Makefile b/prism/src/settings/Makefile index 679b0bd8..cfa5b4c3 100644 --- a/prism/src/settings/Makefile +++ b/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 diff --git a/prism/src/simulator/Makefile b/prism/src/simulator/Makefile index 602b55ba..6020fdb2 100644 --- a/prism/src/simulator/Makefile +++ b/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" diff --git a/prism/src/sparse/Makefile b/prism/src/sparse/Makefile index 0617a8ab..dcc6b239 100644 --- a/prism/src/sparse/Makefile +++ b/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) diff --git a/prism/src/userinterface/Makefile b/prism/src/userinterface/Makefile index 265b7743..50268328 100644 --- a/prism/src/userinterface/Makefile +++ b/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"