From 20a6be968b42c38dbdd8f415874066c5359f31a7 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sun, 29 Oct 2006 22:02:32 +0000 Subject: [PATCH] Removal of explicit lists of Java/C++ files from Makefiles (we are reliant on GNU make anyway). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@83 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/apmc/Makefile | 7 +------ prism/src/dd/Makefile | 7 +------ prism/src/dv/Makefile | 14 ++------------ prism/src/hybrid/Makefile | 14 ++------------ prism/src/jdd/Makefile | 14 ++------------ prism/src/mtbdd/Makefile | 14 ++------------ prism/src/odd/Makefile | 14 ++------------ prism/src/parser/Makefile | 8 +------- prism/src/prism/Makefile | 20 ++------------------ prism/src/settings/Makefile | 16 +--------------- prism/src/simulator/Makefile | 20 ++------------------ prism/src/sparse/Makefile | 14 ++------------ prism/src/userinterface/Makefile | 7 +------ 13 files changed, 21 insertions(+), 148 deletions(-) diff --git a/prism/src/apmc/Makefile b/prism/src/apmc/Makefile index 28228182..97e5dbcd 100644 --- a/prism/src/apmc/Makefile +++ b/prism/src/apmc/Makefile @@ -10,12 +10,7 @@ THIS_DIR = apmc PRISM_DIR_REL = ../.. -JAVA_FILES = \ -ApmcException.java Apmc.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) default: all diff --git a/prism/src/dd/Makefile b/prism/src/dd/Makefile index 081d4c62..4fd43141 100644 --- a/prism/src/dd/Makefile +++ b/prism/src/dd/Makefile @@ -24,12 +24,7 @@ LIBRARIES = \ -lst \ -lepd -CC_FILES = \ -dd.cc dd_abstr.cc dd_basics.cc dd_cudd.cc dd_export.cc dd_info.cc dd_matrix.cc dd_term.cc dd_test.cc dd_vars.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/dv/Makefile b/prism/src/dv/Makefile index 48960e43..8f1785b3 100644 --- a/prism/src/dv/Makefile +++ b/prism/src/dv/Makefile @@ -23,20 +23,10 @@ LIBRARIES = \ -ldd \ -lm -JAVA_FILES = \ -DoubleVector.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -DoubleVector.cc dv.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/hybrid/Makefile b/prism/src/hybrid/Makefile index 58dc4b25..4694fa79 100644 --- a/prism/src/hybrid/Makefile +++ b/prism/src/hybrid/Makefile @@ -25,20 +25,10 @@ LIBRARIES = \ -lprism \ -lm -JAVA_FILES = \ -PrismHybrid.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -hybrid.cc PH_JOR.cc PH_NondetBoundedUntil.cc PH_NondetReachReward.cc PH_NondetUntil.cc PH_Power.cc PH_ProbBoundedUntil.cc PH_ProbReachReward.cc PH_ProbUntil.cc PH_PSOR.cc PH_SOR.cc PH_StochBoundedUntil.cc PH_StochCumulReward.cc PH_StochSteadyState.cc PH_StochTransient.cc PrismHybrid.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/jdd/Makefile b/prism/src/jdd/Makefile index 31a1ceca..ed28f969 100644 --- a/prism/src/jdd/Makefile +++ b/prism/src/jdd/Makefile @@ -21,20 +21,10 @@ LIBRARIES = \ -L$(PRISM_DIR_REL)/$(LIB_DIR) \ -ldd -JAVA_FILES = \ -JDD.java JDDNode.java JDDTest.java JDDVars.java JDDVectorConsumer.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -JDD.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/mtbdd/Makefile b/prism/src/mtbdd/Makefile index db766ae3..23670f1e 100644 --- a/prism/src/mtbdd/Makefile +++ b/prism/src/mtbdd/Makefile @@ -24,20 +24,10 @@ LIBRARIES = \ -lprism \ -lm -JAVA_FILES = \ -PrismMTBDD.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -PM_ExportLabels.cc PM_ExportMatrix.cc PM_ExportVector.cc PM_JOR.cc PM_NondetBoundedUntil.cc PM_NondetReachReward.cc PM_NondetUntil.cc PM_Power.cc PM_Prob0A.cc PM_Prob0.cc PM_Prob0E.cc PM_Prob1A.cc PM_Prob1.cc PM_Prob1E.cc PM_ProbBoundedUntil.cc PM_ProbReachReward.cc PM_ProbUntil.cc PM_Reachability.cc PM_StochBoundedUntil.cc PM_StochCumulReward.cc PM_StochSteadyState.cc PM_StochTransient.cc PrismMTBDD.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/odd/Makefile b/prism/src/odd/Makefile index b28cc99d..278a726c 100644 --- a/prism/src/odd/Makefile +++ b/prism/src/odd/Makefile @@ -21,20 +21,10 @@ LIBRARIES = \ -L$(PRISM_DIR_REL)/$(LIB_DIR) \ -ldd -JAVA_FILES = \ -ODDUtils.java ODDNode.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -ODDUtils.cc odd.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/parser/Makefile b/prism/src/parser/Makefile index 186314db..67ea8fac 100644 --- a/prism/src/parser/Makefile +++ b/prism/src/parser/Makefile @@ -10,13 +10,7 @@ THIS_DIR = parser PRISM_DIR_REL = ../.. -JAVA_FILES = \ -Command.java ConstantList.java Declaration.java ExpressionAnd.java ExpressionBinary.java ExpressionBrackets.java ExpressionConstant.java ExpressionDivide.java ExpressionDouble.java ExpressionFalse.java ExpressionFormula.java ExpressionFunc.java ExpressionIdent.java ExpressionInt.java ExpressionITE.java Expression.java ExpressionMinus.java ExpressionNary.java ExpressionNot.java ExpressionOr.java ExpressionPlus.java ExpressionRange.java ExpressionRelOp.java ExpressionTimes.java ExpressionTrue.java ExpressionUnary.java ExpressionUnaryMinus.java ExpressionVar.java ForLoop.java FormulaList.java LabelList.java Module.java ModulesFile.java ParseException.java PCTLAnd.java PCTLBrackets.java PCTLExpression.java PCTLFormulaBinary.java PCTLFormula.java PCTLFormulaNary.java PCTLFormulaUnary.java PCTLImplies.java PCTLInit.java PCTLLabel.java PCTLNot.java PCTLOr.java PCTLProbBoundedUntil.java PCTLProb.java PCTLProbNext.java PCTLProbUntil.java PCTLRewardCumul.java PCTLRewardInst.java PCTLReward.java PCTLRewardReach.java PCTLRewardSS.java PCTLSS.java PrismParserConstants.java PrismParser.java PrismParserTokenManager.java PrismSyntaxHighlighter.java PropertiesFile.java RenamedModule.java RewardStructItem.java RewardStruct.java SimpleCharStream.java SystemBrackets.java SystemDefn.java SystemFullParallel.java SystemHide.java SystemInterleaved.java SystemModule.java SystemParallel.java SystemRename.java Token.java TokenMgrError.java Update.java Updates.java Values.java VarList.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java - -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) 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 b6cdedda..42a0faed 100644 --- a/prism/src/prism/Makefile +++ b/prism/src/prism/Makefile @@ -19,26 +19,10 @@ $(JAVA_INCLUDES) \ LIBRARIES = \ -lm -JAVA_FILES = \ -DefinedConstant.java DisplayableData.java Explicit2MTBDD.java Expression2MTBDD.java ModelChecker.java Model.java Modules2MTBDD.java NondetModelChecker.java NondetModel.java Preprocessor.java PrismCL.java PrismException.java PrismFileLog.java Prism.java PrismLog.java PrismSettings.java PrismSettingsListener.java PrismUtils.java ProbModelChecker.java ProbModel.java PropertyConstants.java RangingConstant.java ResultsCollection.java SCCComputer.java StateList.java StateListMTBDD.java StateProbsDV.java StateProbs.java StateProbsMTBDD.java StochModelChecker.java StochModel.java UndefinedConstants.java -#echo `/bin/ls *.java` - - -#JAVA_FILES:sh = /bin/ls *.java - - - - -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -foxglynn.cc PrismUtils.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/settings/Makefile b/prism/src/settings/Makefile index 71e01532..679b0bd8 100644 --- a/prism/src/settings/Makefile +++ b/prism/src/settings/Makefile @@ -10,21 +10,7 @@ THIS_DIR = settings PRISM_DIR_REL = ../.. -JAVA_FILES = \ -Apple.java BooleanConstraint.java BooleanEditor.java BooleanRenderer.java BooleanSetting.java ChoiceEditor.java ChoiceRenderer.java ChoiceSetting.java ColorConstraint.java ColorEditor.java ColorRenderer.java ColorSetting.java DefaultSettingOwner.java DoubleEditor.java DoubleRangeConstraint.java DoubleRenderer.java DoubleSetting.java FileEditor.java FileRenderer.java FileSelector.java FileSetting.java FontChooser.java FontColorConstraint.java FontColorEditor.java FontColorPair.java FontColorRenderer.java FontColorSetting.java IntegerEditor.java IntegerRenderer.java IntegerSetting.java MultipleLineStringEditor.java MultipleLineStringRenderer.java MultipleLineStringSetting.java NumericConstraint.java Orange.java RangeConstraint.java SettingConstraint.java SettingDisplay.java SettingEditor.java SettingException.java Setting.java SettingOwner.java SettingRenderer.java SettingTable.java SingleLineStringEditor.java SingleLineStringRenderer.java SingleLineStringSetting.java StringConstraint.java TableResizer.java Test2.java Test.java - -#echo `/bin/ls *.java` - - - - - - - - -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) 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 0b584673..d616ac16 100644 --- a/prism/src/simulator/Makefile +++ b/prism/src/simulator/Makefile @@ -21,26 +21,10 @@ LIBRARIES = \ -L$(PRISM_DIR_REL)/$(LIB_DIR) \ -lm -JAVA_FILES = \ -./networking/FileSystem.java ./networking/RemoteHandler.java ./networking/SimulatorResultsFile.java ./networking/SimulatorNetworkHandler.java ./networking/SSHHost.java ./NetTest.java ./SimulatorEngine.java ./SimulatorException.java - -#echo `find . -name '*.java'` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(shell find . -name '*.java') CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -simexpression.cc simexpressionbuilder.cc \ -simutil.cc simstate.cc simmodel.cc simreasoning.cc simupdater.cc simpctl.cc \ -simsampling.cc simpath.cc simformulae.cc \ -SimulatorEngine.cc \ -simtransitionbuilder.cc simrandom.cc simpctlbuilder.cc simengine.cc \ -simrewardsbuilder.cc simiohandler.cc simtest.cc simlog.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/sparse/Makefile b/prism/src/sparse/Makefile index 9c995e23..2bec757a 100644 --- a/prism/src/sparse/Makefile +++ b/prism/src/sparse/Makefile @@ -25,20 +25,10 @@ LIBRARIES = \ -lprism \ -lm -JAVA_FILES = \ -PrismSparse.java -#echo `/bin/ls *.java` -#JAVA_FILES:sh = /bin/ls *.java -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(wildcard *.java) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) -CC_FILES = \ -PrismSparse.cc PS_ExportMatrix.cc PS_ExportMDP.cc PS_ExportSubMDP.cc PS_JOR.cc PS_NondetBoundedUntil.cc PS_NondetReachReward.cc PS_NondetUntil.cc PS_Power.cc PS_ProbBoundedUntil.cc PS_ProbReachReward.cc PS_ProbUntil.cc PS_SOR.cc PS_StochBoundedUntil.cc PS_StochCumulReward.cc PS_StochSteadyState.cc PS_StochTransient.cc sparse.cc -#echo `/bin/ls *.cc` -#CC_FILES:sh = /bin/ls *.cc -#CC_FILES = $(wildcard *.cc) - +CC_FILES = $(wildcard *.cc) O_FILES = $(CC_FILES:%.cc=$(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/%.o) default: all diff --git a/prism/src/userinterface/Makefile b/prism/src/userinterface/Makefile index 4cde2947..fe509968 100644 --- a/prism/src/userinterface/Makefile +++ b/prism/src/userinterface/Makefile @@ -10,12 +10,7 @@ THIS_DIR = userinterface PRISM_DIR_REL = ../.. -JAVA_FILES = \ -./GUIClipboard.java ./GUIClipboardEvent.java ./GUIConstantsPicker.java ./GUIFileMenu.java ./GUIGeneralOptions.java ./GUINetwork.java ./GUINetworkOptions.java ./GUIOptionsDialog.java ./GUIPlugin.java ./GUIPrism.java ./log/GUILog.java ./log/GUIVisualLogger.java ./log/GUIVisualLogModel.java ./log/GUIWindowLog.java ./GUIPrismSplash.java ./GUISimulationPicker.java ./GUITaskBar.java ./model/computation/BuildModelThread.java ./model/computation/ComputeSteadyStateThread.java ./model/computation/ComputeTransientThread.java ./model/computation/ExportBuiltModelThread.java ./model/computation/LoadGraphicModelThread.java ./model/computation/LoadPEPAModelThread.java ./model/computation/LoadPRISMModelThread.java ./model/computation/ParseModelThread.java ./model/computation/SaveGraphicModelThread.java ./model/computation/SavePEPAModelThread.java ./model/computation/SavePRISMModelThread.java ./model/graphicModel/Decision.java ./model/graphicModel/ExpressionLabel.java ./model/graphicModel/GraphicModuleContainer.java ./model/graphicModel/GraphicSelection.java ./model/graphicModel/GraphicToolBar.java ./model/graphicModel/GUIGraphicModelEditor.java ./model/graphicModel/ModuleDrawingPane.java ./model/graphicModel/ModuleModel.java ./model/graphicModel/ModulesPanel.java ./model/graphicModel/Nail.java ./model/graphicModel/ProbTransition.java ./model/graphicModel/State.java ./model/graphicModel/StringLabel.java ./model/graphicModel/Transition.java ./model/GUIModelEditor.java ./model/GUIModelEvent.java ./model/GUIMultiModel.java ./model/GUIMultiModelHandler.java ./model/GUIMultiModelTree.java ./model/GUITextModelEditor.java ./model/GUITransientTime.java ./model/pepaModel/GUIPepaModelEditor.java ./model/Style.java ./OptionsPanel.java ./properties/computation/ExportResultsThread.java ./properties/computation/LoadPropertiesThread.java ./properties/computation/ModelCheckThread.java ./properties/computation/SavePropertiesThread.java ./properties/computation/SimulateModelCheckThread.java ./properties/ConstantHeader.java ./properties/ConstantLine.java ./properties/ConstantPickerList.java ./properties/GraphConstantHeader.java ./properties/GraphConstantLine.java ./properties/GraphConstantPickerList.java ./properties/GUIExperiment.java ./properties/GUIExperimentPicker.java ./properties/GUIExperimentTable.java ./properties/GUIGraphHandler.java ./properties/GUIGraphPicker.java ./properties/GUILabel.java ./properties/GUIMultiProperties.java ./properties/GUIPropConstantList.java ./properties/GUIPropertiesEvent.java ./properties/GUIPropertiesList.java ./properties/GUIProperty.java ./properties/GUIPropertyEditor.java ./properties/GUIPropertyResultDialog.java ./properties/GUIPropLabelList.java ./properties/GUIResultsTable.java ./SimulationInformation.java ./simulator/GUIInitialStatePicker.java ./simulator/GUISimLabelFormulaeList.java ./simulator/GUISimPathFormulaeList.java ./simulator/GUISimulator.java ./simulator/networking/GUINetworkEditor.java ./simulator/networking/GUISimulatorDistributionDialog.java ./simulator/GUISimulatorPathTable.java ./simulator/GUISimulatorUpdatesTable.java ./util/BooleanProperty.java ./util/ChoiceProperty.java ./util/ColourProperty.java ./util/DoubleProperty.java ./util/ExpressionProperty.java ./util/FontChooser.java ./util/FontColorPair.java ./util/FontColorProperty.java ./util/GUIComputationEvent.java ./util/GUIEvent.java ./util/GUIEventHandler.java ./util/GUIEventListener.java ./util/GUIException.java ./util/GUIExitEvent.java ./util/GUILogEvent.java ./util/GUIPrismFileFilter.java ./util/MultipleProperty.java ./util/PresentationMetalTheme.java ./util/PropertyConstants.java ./util/PropertyException.java ./util/PropertyOwner.java ./util/PropertyTable.java ./util/PropertyTableModel.java ./util/SelectionEvent.java ./util/SelectionListener.java ./util/SelectionModel.java ./util/SeriesDataProperty.java ./util/SingleProperty.java ./util/Test2.java ./GUIComputationThread.java -#echo `find . -name '*.java'` -#JAVA_FILES:sh = find . -name '*.java' -#JAVA_FILES = $(wildcard *.java) - +JAVA_FILES = $(shell find . -name '*.java') CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) default: all