Skip to content

Commit 209a2ca

Browse files
committed
Removed Polya submodule. Updated to revision 1.0.8.
1 parent f8b5a9d commit 209a2ca

4 files changed

Lines changed: 12 additions & 16 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "polya"]
2-
path = polya
3-
url = https://github.com/rosenbrockc/polya
41
[submodule "symlib"]
52
path = symlib
63
url = https://github.com/msg-byu/symlib

HISTORY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Revision History for `enumlib`
22

3+
## Revision 1.0.8
4+
5+
- Removed Polya submodule.
6+
37
## Revision 1.0.7
48

59
- Removed makestructin.x from the makefile since it's driver is no

polya

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Makefile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,43 @@ SHELL = /bin/bash
88

99
# enumlib library paths
1010
LBD1 = ../symlib/src
11-
LBD2 = ../polya/fortran
1211

1312
FOUND = false
1413
ifeq (${F90},gfortran) # gfortran compiler
1514
ifeq (${DEBUG},false)
16-
FFLAGS = -O3 -ffree-line-length-none -fno-underscoring -I${LBD1} -I${LBD2}
15+
FFLAGS = -O3 -ffree-line-length-none -fno-underscoring -I${LBD1}
1716
FOUND = true
1817
else
19-
FFLAGS = -fPIC -g -fbounds-check -Wall -ffree-line-length-none -fno-underscoring -I${LBD1} -I${LBD2}
18+
FFLAGS = -fPIC -g -fbounds-check -Wall -ffree-line-length-none -fno-underscoring -I${LBD1}
2019
FOUND = true
2120
endif
2221
endif
2322

2423
ifeq (${F90},ifc) # Intel compiler
25-
FFLAGS = -fPIC -g -error-limit 7 -traceback -check bounds -warn -I${LBD1} -I${LBD2}
24+
FFLAGS = -fPIC -g -error-limit 7 -traceback -check bounds -warn -I${LBD1}
2625
FOUND = true
2726
endif
2827

2928
ifeq (${F90},ifort) # Intel compiler
3029
ifeq (${DEBUG},false)
31-
FFLAGS = -fPIC -O3 -I${LBD1} -I${LBD2}
30+
FFLAGS = -fPIC -O3 -I${LBD1}
3231
FOUND = true
3332
else
3433
# F90 = /opt/intel/fc/10.0.016/bin/ifort
35-
FFLAGS = -fPIC -g -debug -error-limit 7 -heap-arrays -traceback -check bounds -warn -I${LBD1} -I${LBD2}
34+
FFLAGS = -fPIC -g -debug -error-limit 7 -heap-arrays -traceback -check bounds -warn -I${LBD1}
3635
FOUND = true
3736
#-prof-use -prof-dir .
3837
endif
3938
endif
4039

4140

4241
ifeq (${F90},xlf90) # IBM compiler
43-
FFLAGS = -g -C -fPIC -qsuffix=f=f90 -I${LBD1} -I${LBD2}
42+
FFLAGS = -g -C -fPIC -qsuffix=f=f90 -I${LBD1}
4443
FOUND = true
4544
endif
4645
ifeq (${F90},f95) # Absoft PPC compiler
4746
# FFLAGS = -profile -p ${LBDR}
48-
FFLAGS = -g -Rb -Rc -fPIC -nodefaultmod -p ${LBD1} -I${LBD2} #-ea
47+
FFLAGS = -g -Rb -Rc -fPIC -nodefaultmod -p ${LBD1} #-ea
4948
# B80 show entry in subprograms ; Rb bounds; Rc array conformance;
5049
# z2 warning level
5150
# -O3 optimization
@@ -71,15 +70,14 @@ SRC = sorting.f90 enumeration_types.f90 io_utils.f90 arrow_related.f90 tree_clas
7170

7271
OBJS = ${SRC:.f90=.o}
7372
LIBS = $(LBD1)/libcomparestructs.a $(LBD1)/libutils.a $(LBD1)/libsym.a \
74-
$(LBD1)/librational.a $(LBD1)/libcombinatorics.a $(LBD2)/libpolya.a
73+
$(LBD1)/librational.a $(LBD1)/libcombinatorics.a
7574
VPATH:= ../aux_src: ../src
7675

7776
.SUFFIXES :
7877
.SUFFIXES : .f .f90 .f95 .o
7978

8079
pre_comp:
8180
+$(MAKE) -C ../symlib/src
82-
+$(MAKE) -C ../polya/fortran
8381

8482
libenum.a: ${OBJS}
8583
ar ru $@ $?
@@ -132,10 +130,8 @@ compare_enum_files.x: pre_comp compare_two_enum_files.o
132130
CLEAN = *.o *.mod *.a *.x svn-commit.*
133131
clean :
134132
+$(MAKE) clean -C ../symlib/src
135-
+$(MAKE) clean -C ../polya/fortran
136133
rm -f ${CLEAN}
137134
clobber :
138135
+$(MAKE) clobber -C ../symlib/src
139-
+$(MAKE) clobber -C ../polya/fortran
140136
rm -f ${CLEAN} *~ \#*
141137
make

0 commit comments

Comments
 (0)