From 5041398fae2e9753d596af8d72014344be769299 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 25 Jan 2007 13:53:10 +0000 Subject: [PATCH] Tidy up of CUDD makefiles (and addition of 64-bit Linux makefile). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@222 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- cudd/Makefile.cygwin | 106 +----------------------------- cudd/Makefile.darwin | 103 ----------------------------- cudd/Makefile.linux | 107 ++----------------------------- cudd/{Makefile => Makefile.orig} | 32 ++------- cudd/Makefile.solaris | 88 ------------------------- 5 files changed, 13 insertions(+), 423 deletions(-) rename cudd/{Makefile => Makefile.orig} (94%) diff --git a/cudd/Makefile.cygwin b/cudd/Makefile.cygwin index 4af3369a..05cbe5ac 100644 --- a/cudd/Makefile.cygwin +++ b/cudd/Makefile.cygwin @@ -60,115 +60,13 @@ ICFLAGS = #XCFLAGS = -DHAVE_IEEE_754 -DBSD # #========================== -# Linux -# -# Gcc 2.8.1 or higher on i686. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD -# Gcc 3.2.2 or higher on i686. -#XCFLAGS = -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -# Icc on i686. -#XCFLAGS = -ansi -align -ip -DHAVE_IEEE_754 -DBSD -# Gcc on ia64. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Ecc on ia64. -#XCFLAGS = -ansi -DBSD -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== -# Solaris -# -# For Solaris, BSD should not be replaced by UNIX100. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN -# Gcc 2.8.1 or higher on Ultrasparc. -#XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN -# For Solaris 2.5 and higher, optimized code with /usr/bin/cc or CC. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -native -dalign -DEPD_BIG_ENDIAN -# On IA platforms, -dalign is not supported and causes warnings. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -native -# Recent Sun compilers won't let you use -native on old Ultras. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -dalign -xlibmil -DEPD_BIG_ENDIAN -# For Solaris 2.4, optimized code with /usr/bin/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO4 -dalign -DEPD_BIG_ENDIAN -# For Solaris 2.5 and higher, optimized code with /usr/ucb/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO5 -native -dalign -DEPD_BIG_ENDIAN -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO5 -dalign -xlibmil -DEPD_BIG_ENDIAN -# For Solaris 2.4, optimized code with /usr/ucb/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO4 -dalign -DEPD_BIG_ENDIAN -# -#========================== -# DEC Alphas running Digital Unix -# -# For DEC Alphas either -ieee_with_inexact or -ieee_with_no_inexact is -# needed. If you use only BDDs, -ieee_with_no_inexact is enough. -# In the following, we consider three different compilers: -# - the old native compiler (the one of MIPS ancestry that produces u-code); -# - the new native compiler; -# - gcc -# On the Alphas, gcc (as of release 2.7.2) does not support 32-bit pointers -# and IEEE 754 floating point arithmetic. Therefore, for this architecture -# only, the native compilers provide a substatial advantage. -# With the native compilers, specify -xtaso for 32-bit pointers. -# Do not use -xtaso_short because explicit reference to stdout and stderr -# does not work with this option. (Among other things.) -# Notice that -taso must be included in LDFLAGS for -xtaso to work. -# Given the number of possible choices, only some typical configurations -# are proposed here. -# -# Old native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Old native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# gcc for the Alphas: compile without HAVE_IEEE_754. -#XCFLAGS = -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== -# -# IBM RS6000 -# -# For the IBM RS6000 -qstrict is necessary when specifying -O3 with cc. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -DEPD_BIG_ENDIAN -O3 -qstrict -# -#========================== -# -# HP-UX -# -# I haven't figured out how to enable IEEE 754 on the HPs I've tried... -# For HP-UX using gcc. -#XCFLAGS = -DUNIX100 -DEPD_BIG_ENDIAN -# For HP-UX using c89. -#XCFLAGS = +O3 -DUNIX100 -DEPD_BIG_ENDIAN -# -#========================== # # Windows95/98/NT/XP with Cygwin tools +# And using MinGW headers/libraries to avoid needing Cygwin DLL at run-time # -# For b16 it was also necessary to change setup.sh (define CREATE -# as "cp"). This is no longer necessary since b17.1. -# The value of RLIMIT_DATA_DEFAULT should reflect the amount of -# available memory (expressed in bytes). -# Recent versions of cygwin have getrlimit, but the datasize limit -# cannot be set. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 +XCFLAGS = -mno-cygwin -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 # #========================== -# -# As above but using MingW -# -# Just need -mno-cygwin flag to ensure that gcc uses the Mingw headers when -# compiling and not the Cygwin API headers -XCFLAGS = -mno-cygwin -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -# -#========================== -# -# Mac OS X (Darwin) -# -#XCFLAGS = -DHAVE_IEEE_754 -fno-common -# -#========================== - # Define the level of self-checking and verbosity of the CUDD package. #DDDEBUG = -DDD_DEBUG -DDD_VERBOSE -DDD_STATS -DDD_CACHE_PROFILE -DDD_UNIQUE_PROFILE -DDD_COUNT diff --git a/cudd/Makefile.darwin b/cudd/Makefile.darwin index 02a2fb50..16d98fb8 100644 --- a/cudd/Makefile.darwin +++ b/cudd/Makefile.darwin @@ -60,108 +60,6 @@ ICFLAGS = #XCFLAGS = -DHAVE_IEEE_754 -DBSD # #========================== -# Linux -# -# Gcc 2.8.1 or higher on i686. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD -# Gcc 3.2.2 or higher on i686. -#XCFLAGS = -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -# Icc on i686. -#XCFLAGS = -ansi -align -ip -DHAVE_IEEE_754 -DBSD -# Gcc on ia64. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Ecc on ia64. -#XCFLAGS = -ansi -DBSD -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== -# Solaris -# -# For Solaris, BSD should not be replaced by UNIX100. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN -# Gcc 2.8.1 or higher on Ultrasparc. -#XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN -# For Solaris 2.5 and higher, optimized code with /usr/bin/cc or CC. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -native -dalign -DEPD_BIG_ENDIAN -# On IA platforms, -dalign is not supported and causes warnings. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -native -# Recent Sun compilers won't let you use -native on old Ultras. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -dalign -xlibmil -DEPD_BIG_ENDIAN -# For Solaris 2.4, optimized code with /usr/bin/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO4 -dalign -DEPD_BIG_ENDIAN -# For Solaris 2.5 and higher, optimized code with /usr/ucb/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO5 -native -dalign -DEPD_BIG_ENDIAN -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO5 -dalign -xlibmil -DEPD_BIG_ENDIAN -# For Solaris 2.4, optimized code with /usr/ucb/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO4 -dalign -DEPD_BIG_ENDIAN -# -#========================== -# DEC Alphas running Digital Unix -# -# For DEC Alphas either -ieee_with_inexact or -ieee_with_no_inexact is -# needed. If you use only BDDs, -ieee_with_no_inexact is enough. -# In the following, we consider three different compilers: -# - the old native compiler (the one of MIPS ancestry that produces u-code); -# - the new native compiler; -# - gcc -# On the Alphas, gcc (as of release 2.7.2) does not support 32-bit pointers -# and IEEE 754 floating point arithmetic. Therefore, for this architecture -# only, the native compilers provide a substatial advantage. -# With the native compilers, specify -xtaso for 32-bit pointers. -# Do not use -xtaso_short because explicit reference to stdout and stderr -# does not work with this option. (Among other things.) -# Notice that -taso must be included in LDFLAGS for -xtaso to work. -# Given the number of possible choices, only some typical configurations -# are proposed here. -# -# Old native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Old native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# gcc for the Alphas: compile without HAVE_IEEE_754. -#XCFLAGS = -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== -# -# IBM RS6000 -# -# For the IBM RS6000 -qstrict is necessary when specifying -O3 with cc. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -DEPD_BIG_ENDIAN -O3 -qstrict -# -#========================== -# -# HP-UX -# -# I haven't figured out how to enable IEEE 754 on the HPs I've tried... -# For HP-UX using gcc. -#XCFLAGS = -DUNIX100 -DEPD_BIG_ENDIAN -# For HP-UX using c89. -#XCFLAGS = +O3 -DUNIX100 -DEPD_BIG_ENDIAN -# -#========================== -# -# Windows95/98/NT/XP with Cygwin tools -# -# For b16 it was also necessary to change setup.sh (define CREATE -# as "cp"). This is no longer necessary since b17.1. -# The value of RLIMIT_DATA_DEFAULT should reflect the amount of -# available memory (expressed in bytes). -# Recent versions of cygwin have getrlimit, but the datasize limit -# cannot be set. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -# -#========================== -# -# As above but using MingW -# -# Just need -mno-cygwin flag to ensure that gcc uses the Mingw headers when -# compiling and not the Cygwin API headers -#XCFLAGS = -mno-cygwin -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -# -#========================== # # Mac OS X (Darwin) # @@ -169,7 +67,6 @@ XCFLAGS = -DHAVE_IEEE_754 -fno-common # #========================== - # Define the level of self-checking and verbosity of the CUDD package. #DDDEBUG = -DDD_DEBUG -DDD_VERBOSE -DDD_STATS -DDD_CACHE_PROFILE -DDD_UNIQUE_PROFILE -DDD_COUNT DDDEBUG = diff --git a/cudd/Makefile.linux b/cudd/Makefile.linux index 373bc499..f5619770 100644 --- a/cudd/Makefile.linux +++ b/cudd/Makefile.linux @@ -60,115 +60,16 @@ ICFLAGS = #XCFLAGS = -DHAVE_IEEE_754 -DBSD # #========================== -# Linux +# Linux (32-bit) # +# Gcc on i686. +XCFLAGS = -march=i686 -m32 -malign-double -DHAVE_IEEE_754 -DBSD # Gcc 2.8.1 or higher on i686. -XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD +#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD # Gcc 3.2.2 or higher on i686. #XCFLAGS = -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -# Icc on i686. -#XCFLAGS = -ansi -align -ip -DHAVE_IEEE_754 -DBSD -# Gcc on ia64. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Ecc on ia64. -#XCFLAGS = -ansi -DBSD -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 # #========================== -# Solaris -# -# For Solaris, BSD should not be replaced by UNIX100. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN -# Gcc 2.8.1 or higher on Ultrasparc. -#XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN -# For Solaris 2.5 and higher, optimized code with /usr/bin/cc or CC. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -native -dalign -DEPD_BIG_ENDIAN -# On IA platforms, -dalign is not supported and causes warnings. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -native -# Recent Sun compilers won't let you use -native on old Ultras. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO5 -dalign -xlibmil -DEPD_BIG_ENDIAN -# For Solaris 2.4, optimized code with /usr/bin/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DUNIX100 -xO4 -dalign -DEPD_BIG_ENDIAN -# For Solaris 2.5 and higher, optimized code with /usr/ucb/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO5 -native -dalign -DEPD_BIG_ENDIAN -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO5 -dalign -xlibmil -DEPD_BIG_ENDIAN -# For Solaris 2.4, optimized code with /usr/ucb/cc. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO4 -dalign -DEPD_BIG_ENDIAN -# -#========================== -# DEC Alphas running Digital Unix -# -# For DEC Alphas either -ieee_with_inexact or -ieee_with_no_inexact is -# needed. If you use only BDDs, -ieee_with_no_inexact is enough. -# In the following, we consider three different compilers: -# - the old native compiler (the one of MIPS ancestry that produces u-code); -# - the new native compiler; -# - gcc -# On the Alphas, gcc (as of release 2.7.2) does not support 32-bit pointers -# and IEEE 754 floating point arithmetic. Therefore, for this architecture -# only, the native compilers provide a substatial advantage. -# With the native compilers, specify -xtaso for 32-bit pointers. -# Do not use -xtaso_short because explicit reference to stdout and stderr -# does not work with this option. (Among other things.) -# Notice that -taso must be included in LDFLAGS for -xtaso to work. -# Given the number of possible choices, only some typical configurations -# are proposed here. -# -# Old native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Old native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# gcc for the Alphas: compile without HAVE_IEEE_754. -#XCFLAGS = -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== -# -# IBM RS6000 -# -# For the IBM RS6000 -qstrict is necessary when specifying -O3 with cc. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -DEPD_BIG_ENDIAN -O3 -qstrict -# -#========================== -# -# HP-UX -# -# I haven't figured out how to enable IEEE 754 on the HPs I've tried... -# For HP-UX using gcc. -#XCFLAGS = -DUNIX100 -DEPD_BIG_ENDIAN -# For HP-UX using c89. -#XCFLAGS = +O3 -DUNIX100 -DEPD_BIG_ENDIAN -# -#========================== -# -# Windows95/98/NT/XP with Cygwin tools -# -# For b16 it was also necessary to change setup.sh (define CREATE -# as "cp"). This is no longer necessary since b17.1. -# The value of RLIMIT_DATA_DEFAULT should reflect the amount of -# available memory (expressed in bytes). -# Recent versions of cygwin have getrlimit, but the datasize limit -# cannot be set. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -# -#========================== -# -# As above but using MingW -# -# Just need -mno-cygwin flag to ensure that gcc uses the Mingw headers when -# compiling and not the Cygwin API headers -#XCFLAGS = -mno-cygwin -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -# -#========================== -# -# Mac OS X (Darwin) -# -#XCFLAGS = -DHAVE_IEEE_754 -fno-common -# -#========================== - # Define the level of self-checking and verbosity of the CUDD package. #DDDEBUG = -DDD_DEBUG -DDD_VERBOSE -DDD_STATS -DDD_CACHE_PROFILE -DDD_UNIQUE_PROFILE -DDD_COUNT diff --git a/cudd/Makefile b/cudd/Makefile.orig similarity index 94% rename from cudd/Makefile rename to cudd/Makefile.orig index 373bc499..ac74942c 100644 --- a/cudd/Makefile +++ b/cudd/Makefile.orig @@ -37,10 +37,10 @@ CC = gcc # On some machines ranlib is either non-existent or redundant. # Use the following definition if your machine has ranlib and you think # it is needed. -#RANLIB = ranlib +RANLIB = ranlib # Use the following definition if your machine either does not have # ranlib (e.g., SUN running solaris) or can do without it (e.g., DEC Alpha). -RANLIB = : +#RANLIB = : # Use ICFLAGS to specify machine-independent compilation flags. # These three are typical settings for cc. @@ -50,10 +50,9 @@ RANLIB = : # These four are typical settings for optimized code with gcc. The # last two also work with icc/ecc. #ICFLAGS = -g -O6 -Wall -#ICFLAGS = -g -O6 +ICFLAGS = -g -O6 #ICFLAGS = -g -O3 -Wall #ICFLAGS = -g -O3 -ICFLAGS = # Use XCFLAGS to specify machine-dependent compilation flags. # For some platforms no special flags are needed. @@ -152,22 +151,6 @@ XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD # Recent versions of cygwin have getrlimit, but the datasize limit # cannot be set. #XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -# -#========================== -# -# As above but using MingW -# -# Just need -mno-cygwin flag to ensure that gcc uses the Mingw headers when -# compiling and not the Cygwin API headers -#XCFLAGS = -mno-cygwin -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -# -#========================== -# -# Mac OS X (Darwin) -# -#XCFLAGS = -DHAVE_IEEE_754 -fno-common -# -#========================== # Define the level of self-checking and verbosity of the CUDD package. @@ -211,9 +194,8 @@ DDWDIR = . IDIR = $(DDWDIR)/include INCLUDE = -I$(IDIR) -#BDIRS = cudd dddmp mtr st util epd -BDIRS = cudd mtr st util epd -DIRS = $(BDIRS) #nanotrav +BDIRS = cudd dddmp mtr st util epd +DIRS = $(BDIRS) nanotrav #------------------------------------------------------------------------ @@ -320,14 +302,14 @@ testmtr: build make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) ) clean: - @for dir in $(DIRS); do \ + @for dir in mnemosyne $(DIRS) obj; do \ (cd $$dir; \ echo Cleaning $$dir ...; \ make -s clean ) \ done distclean: - @for dir in $(DIRS); do \ + @for dir in mnemosyne $(DIRS) obj; do \ (cd $$dir; \ echo Cleaning $$dir ...; \ make -s EXE="$(EXE)" distclean ) \ diff --git a/cudd/Makefile.solaris b/cudd/Makefile.solaris index 0f6a2e2d..6422fe87 100644 --- a/cudd/Makefile.solaris +++ b/cudd/Makefile.solaris @@ -60,20 +60,6 @@ ICFLAGS = #XCFLAGS = -DHAVE_IEEE_754 -DBSD # #========================== -# Linux -# -# Gcc 2.8.1 or higher on i686. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD -# Gcc 3.2.2 or higher on i686. -#XCFLAGS = -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -# Icc on i686. -#XCFLAGS = -ansi -align -ip -DHAVE_IEEE_754 -DBSD -# Gcc on ia64. -#XCFLAGS = -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Ecc on ia64. -#XCFLAGS = -ansi -DBSD -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== # Solaris # # For Solaris, BSD should not be replaced by UNIX100. @@ -95,80 +81,6 @@ XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN #XCFLAGS = -DHAVE_IEEE_754 -DBSD -xO4 -dalign -DEPD_BIG_ENDIAN # #========================== -# DEC Alphas running Digital Unix -# -# For DEC Alphas either -ieee_with_inexact or -ieee_with_no_inexact is -# needed. If you use only BDDs, -ieee_with_no_inexact is enough. -# In the following, we consider three different compilers: -# - the old native compiler (the one of MIPS ancestry that produces u-code); -# - the new native compiler; -# - gcc -# On the Alphas, gcc (as of release 2.7.2) does not support 32-bit pointers -# and IEEE 754 floating point arithmetic. Therefore, for this architecture -# only, the native compilers provide a substatial advantage. -# With the native compilers, specify -xtaso for 32-bit pointers. -# Do not use -xtaso_short because explicit reference to stdout and stderr -# does not work with this option. (Among other things.) -# Notice that -taso must be included in LDFLAGS for -xtaso to work. -# Given the number of possible choices, only some typical configurations -# are proposed here. -# -# Old native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# Old native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 64-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# New native compiler for the Alphas; 32-bit pointers. -#XCFLAGS = -g3 -O4 -std -DBSD -DHAVE_IEEE_754 -ieee_with_no_inexact -tune host -xtaso -DSIZEOF_LONG=8 -# gcc for the Alphas: compile without HAVE_IEEE_754. -#XCFLAGS = -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -# -#========================== -# -# IBM RS6000 -# -# For the IBM RS6000 -qstrict is necessary when specifying -O3 with cc. -#XCFLAGS = -DBSD -DHAVE_IEEE_754 -DEPD_BIG_ENDIAN -O3 -qstrict -# -#========================== -# -# HP-UX -# -# I haven't figured out how to enable IEEE 754 on the HPs I've tried... -# For HP-UX using gcc. -#XCFLAGS = -DUNIX100 -DEPD_BIG_ENDIAN -# For HP-UX using c89. -#XCFLAGS = +O3 -DUNIX100 -DEPD_BIG_ENDIAN -# -#========================== -# -# Windows95/98/NT/XP with Cygwin tools -# -# For b16 it was also necessary to change setup.sh (define CREATE -# as "cp"). This is no longer necessary since b17.1. -# The value of RLIMIT_DATA_DEFAULT should reflect the amount of -# available memory (expressed in bytes). -# Recent versions of cygwin have getrlimit, but the datasize limit -# cannot be set. -#XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -# -#========================== -# -# As above but using MingW -# -# Just need -mno-cygwin flag to ensure that gcc uses the Mingw headers when -# compiling and not the Cygwin API headers -#XCFLAGS = -mno-cygwin -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -# -#========================== -# -# Mac OS X (Darwin) -# -#XCFLAGS = -DHAVE_IEEE_754 -fno-common -# -#========================== - # Define the level of self-checking and verbosity of the CUDD package. #DDDEBUG = -DDD_DEBUG -DDD_VERBOSE -DDD_STATS -DDD_CACHE_PROFILE -DDD_UNIQUE_PROFILE -DDD_COUNT