s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Remove use of -lm linking under Cygwin. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4253 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
f64583167c
commit
ab6d2bbbef
6 changed files with 10 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      prism/Makefile
  2. 2
      prism/src/dv/Makefile
  3. 2
      prism/src/hybrid/Makefile
  4. 2
      prism/src/mtbdd/Makefile
  5. 2
      prism/src/prism/Makefile
  6. 2
      prism/src/sparse/Makefile

5
prism/Makefile
View File

@ -169,6 +169,7 @@ ifeq ($(OSTYPE),linux)
EXE = EXE =
LIBPREFIX = lib LIBPREFIX = lib
LIBSUFFIX = .so LIBSUFFIX = .so
LIBMATH = -lm
OSTYPE_INCLUDE = include OSTYPE_INCLUDE = include
CLASSPATHSEP = : CLASSPATHSEP = :
endif endif
@ -184,6 +185,7 @@ ifeq ($(OSTYPE),solaris)
EXE = EXE =
LIBPREFIX = lib LIBPREFIX = lib
LIBSUFFIX = .so LIBSUFFIX = .so
LIBMATH = -lm
OSTYPE_INCLUDE = include OSTYPE_INCLUDE = include
CLASSPATHSEP = : CLASSPATHSEP = :
endif endif
@ -201,6 +203,7 @@ ifeq ($(OSTYPE),cygwin)
EXE = .exe EXE = .exe
LIBPREFIX = LIBPREFIX =
LIBSUFFIX = .dll LIBSUFFIX = .dll
LIBMATH =
OSTYPE_INCLUDE = include OSTYPE_INCLUDE = include
CLASSPATHSEP = ; CLASSPATHSEP = ;
# Also override default compilers # Also override default compilers
@ -228,6 +231,7 @@ ifeq ($(OSTYPE),darwin)
EXE = EXE =
LIBPREFIX = lib LIBPREFIX = lib
LIBSUFFIX = .dylib LIBSUFFIX = .dylib
LIBMATH = -lm
OSTYPE_INCLUDE = Headers OSTYPE_INCLUDE = Headers
CLASSPATHSEP = : CLASSPATHSEP = :
endif endif
@ -351,6 +355,7 @@ make_dirs:
EXE="$(EXE)" \ EXE="$(EXE)" \
LIBPREFIX="$(LIBPREFIX)" \ LIBPREFIX="$(LIBPREFIX)" \
LIBSUFFIX="$(LIBSUFFIX)" \ LIBSUFFIX="$(LIBSUFFIX)" \
LIBMATH="$(LIBMATH)" \
CLASSPATHSEP="$(CLASSPATHSEP)") \ CLASSPATHSEP="$(CLASSPATHSEP)") \
|| exit 1; \ || exit 1; \
done; \ done; \

2
prism/src/dv/Makefile
View File

@ -22,7 +22,7 @@ LIBRARIES = \
-L$(PRISM_DIR_REL)/$(LIB_DIR) \ -L$(PRISM_DIR_REL)/$(LIB_DIR) \
-lodd \ -lodd \
-ldd \ -ldd \
-lm
$(LIBMATH)
JAVA_FILES = $(wildcard *.java) JAVA_FILES = $(wildcard *.java)
CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)

2
prism/src/hybrid/Makefile
View File

@ -25,7 +25,7 @@ LIBRARIES = \
-ldd \ -ldd \
-ldv \ -ldv \
-lprism \ -lprism \
-lm
$(LIBMATH)
JAVA_FILES = $(wildcard *.java) JAVA_FILES = $(wildcard *.java)
CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)

2
prism/src/mtbdd/Makefile
View File

@ -23,7 +23,7 @@ LIBRARIES = \
-lodd \ -lodd \
-ldd \ -ldd \
-lprism \ -lprism \
-lm
$(LIBMATH)
JAVA_FILES = $(wildcard *.java) JAVA_FILES = $(wildcard *.java)
CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)

2
prism/src/prism/Makefile
View File

@ -18,7 +18,7 @@ INCLUDES = \
-I$(PRISM_DIR_REL)/$(INCLUDE_DIR) -I$(PRISM_DIR_REL)/$(INCLUDE_DIR)
LIBRARIES = \ LIBRARIES = \
-lm
$(LIBMATH)
JAVA_FILES = $(wildcard *.java) JAVA_FILES = $(wildcard *.java)
CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)

2
prism/src/sparse/Makefile
View File

@ -24,7 +24,7 @@ LIBRARIES = \
-ldd \ -ldd \
-ldv \ -ldv \
-lprism \ -lprism \
-lm
$(LIBMATH)
JAVA_FILES = $(wildcard *.java) JAVA_FILES = $(wildcard *.java)
CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class) CLASS_FILES = $(JAVA_FILES:%.java=$(PRISM_DIR_REL)/$(CLASSES_DIR)/$(THIS_DIR)/%.class)

Write Preview
Loading…
Cancel
Save