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
commit
ab6d2bbbef
  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

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

2
prism/src/dv/Makefile

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

2
prism/src/hybrid/Makefile

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

2
prism/src/mtbdd/Makefile

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

2
prism/src/prism/Makefile

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

2
prism/src/sparse/Makefile

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

Loading…
Cancel
Save