28 | 28 |
+#define ${PROGRAM}COMPILEHOST "${HOSTNAME}"
|
29 | 29 |
#endif
|
30 | 30 |
ENDOFRELEASEPOST
|
|
31 |
--- a/src/Vmatch/SELECT/makefile
|
|
32 |
+++ b/src/Vmatch/SELECT/makefile
|
|
33 |
@@ -1,11 +1,11 @@
|
|
34 |
# makefile to compile shared objects using the gnu C compiler
|
|
35 |
# Stefan Kurtz, October 2000
|
|
36 |
|
|
37 |
-CC=gcc
|
|
38 |
+#CC=gcc
|
|
39 |
|
|
40 |
# in 64-bit mode add -m64
|
|
41 |
|
|
42 |
-CFLAGS=-Wall -Werror -O3 -g
|
|
43 |
+CFLAGS+=-Wall -Werror -O3 -g
|
|
44 |
|
|
45 |
ifneq ($(SYSTEM),Windows)
|
|
46 |
CFLAGS+=-fPIC
|
|
47 |
@@ -43,15 +43,15 @@
|
|
48 |
# on most platforms the shared objects have a suffix .so
|
|
49 |
|
|
50 |
%.so:%.c Shareddef
|
|
51 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@
|
|
52 |
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@ ${LDFLAGS}
|
|
53 |
|
|
54 |
mergematches-dbg.so:mergematches.c Shareddef
|
|
55 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -DDEBUG ${SHARED} $< -o $@
|
|
56 |
+ ${CC} ${CFLAGS} ${CPPFLAGS} -DDEBUG ${SHARED} $< -o $@ ${LDFLAGS}
|
|
57 |
|
|
58 |
# on HP-UX the shared objects have a suffix .sl
|
|
59 |
|
|
60 |
%.sl:%.c Shareddef
|
|
61 |
- @${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@
|
|
62 |
+ @${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@ ${LDFLAGS}
|
|
63 |
|
|
64 |
# the following goal generates the output of the C-preprocessor
|
|
65 |
# applied to the given C-file.
|
|
66 |
--- a/src/Vmatch/SELECT/mstat.c
|
|
67 |
+++ b/src/Vmatch/SELECT/mstat.c
|
|
68 |
@@ -87,20 +87,20 @@
|
|
69 |
and \(iend\). The following function reports such section.
|
|
70 |
*/
|
|
71 |
|
|
72 |
-static void showsection(ArrayMstatvalue *mstat,Uint istart,Uint iend)
|
|
73 |
+static void showsection(ArrayMstatvalue *mmstat,Uint istart,Uint iend)
|
|
74 |
{
|
|
75 |
Uint i;
|
|
76 |
Mstatvalue *mstatptr;
|
|
77 |
|
|
78 |
- printf("%lu:\n",(Showuint) mstat->spaceMstatvalue[istart].seqnum1);
|
|
79 |
+ printf("%lu:\n",(Showuint) mmstat->spaceMstatvalue[istart].seqnum1);
|
|
80 |
for(i=istart; i<=iend; i++)
|
|
81 |
{
|
|
82 |
- mstatptr = mstat->spaceMstatvalue + i;
|
|
83 |
- if(mstatptr->seqnum1 != mstat->spaceMstatvalue[istart].seqnum1)
|
|
84 |
+ mstatptr = mmstat->spaceMstatvalue + i;
|
|
85 |
+ if(mstatptr->seqnum1 != mmstat->spaceMstatvalue[istart].seqnum1)
|
|
86 |
{
|
|
87 |
fprintf(stderr,"seqnum1 =%lu != %lu\n",
|
|
88 |
(Showuint) mstatptr->seqnum1,
|
|
89 |
- (Showuint) mstat->spaceMstatvalue[istart].seqnum1);
|
|
90 |
+ (Showuint) mmstat->spaceMstatvalue[istart].seqnum1);
|
|
91 |
exit(EXIT_FAILURE);
|
|
92 |
}
|
|
93 |
printf(" %lu %lu %lu %lu\n",
|
|
94 |
@@ -117,27 +117,27 @@
|
|
95 |
function \texttt{showsection} is applied.
|
|
96 |
*/
|
|
97 |
|
|
98 |
-static void splitMstatvalues(ArrayMstatvalue *mstat)
|
|
99 |
+static void splitMstatvalues(ArrayMstatvalue *mmstat)
|
|
100 |
{
|
|
101 |
Uint i, lastseqnum, istart;
|
|
102 |
|
|
103 |
- if(mstat->nextfreeMstatvalue == 0)
|
|
104 |
+ if(mmstat->nextfreeMstatvalue == 0)
|
|
105 |
{
|
|
106 |
fprintf(stderr,"no matches available\n");
|
|
107 |
exit(EXIT_FAILURE);
|
|
108 |
}
|
|
109 |
- lastseqnum = mstat->spaceMstatvalue[0].seqnum1;
|
|
110 |
+ lastseqnum = mmstat->spaceMstatvalue[0].seqnum1;
|
|
111 |
istart = 0;
|
|
112 |
- for(i=1; i<mstat->nextfreeMstatvalue; i++)
|
|
113 |
+ for(i=1; i<mmstat->nextfreeMstatvalue; i++)
|
|
114 |
{
|
|
115 |
- if(lastseqnum < mstat->spaceMstatvalue[i].seqnum1)
|
|
116 |
+ if(lastseqnum < mmstat->spaceMstatvalue[i].seqnum1)
|
|
117 |
{
|
|
118 |
- showsection(mstat,istart,i-1);
|
|
119 |
- lastseqnum = mstat->spaceMstatvalue[i].seqnum1;
|
|
120 |
+ showsection(mmstat,istart,i-1);
|
|
121 |
+ lastseqnum = mmstat->spaceMstatvalue[i].seqnum1;
|
|
122 |
istart = i;
|
|
123 |
}
|
|
124 |
}
|
|
125 |
- showsection(mstat,istart,i-1);
|
|
126 |
+ showsection(mmstat,istart,i-1);
|
|
127 |
}
|
|
128 |
|
|
129 |
/*
|
|
130 |
--- a/src/Vmatch/SELECT/cgvizout.c
|
|
131 |
+++ b/src/Vmatch/SELECT/cgvizout.c
|
|
132 |
@@ -99,7 +99,7 @@
|
|
133 |
static ArrayConnectdata *edges;
|
|
134 |
|
|
135 |
/*Sorting and grouping of matches. Returns number of generated groups*/
|
|
136 |
-static Uint multmatchesCountingSort ()
|
|
137 |
+static Uint multmatchesCountingSort (void)
|
|
138 |
{
|
|
139 |
Uint maxmatchlen = 0,
|
|
140 |
nof_matches,
|