1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
Author: Joachim Reichel <reichel@debian.org>
Description: Fix build system to work with debian/rules.
Fail if not all tests pass.
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,9 @@
LINK = normal
OPT = opt
COMP = gnu
+ifndef CC
CC = gcc
+endif
YACC = bison
LEX = flex
DCC = gcc
@@ -67,9 +69,10 @@
BINDIR = bin
LIBDIR = lib
-CPPFLAGS = -I$(SRCDIR) -DVERSION='"$(VERSION)"'
-CFLAGS = -O
-LDFLAGS = -lgmp -lz -lm
+CPPFLAGS += -I$(SRCDIR) -DVERSION='"$(VERSION)"'
+CPPFLAGS += -DNO_MSHELL -D__NO_MATH_INLINES -DNDEBUG
+CFLAGS += -O3
+LDFLAGS += -lgmp -lz -lm
YFLAGS = -d -t -v
LFLAGS = -d
ARFLAGS =
@@ -88,7 +91,7 @@
endif
BASE = $(OSTYPE).$(ARCH).$(COMP).$(OPT)
-OBJDIR = obj/O.$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT)
+OBJDIR = obj
NAME = zimpl
BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT)
LIBNAME = $(NAME)-$(VERSION).$(BASE)
@@ -123,10 +126,10 @@
LIBSRC = $(addprefix $(SRCDIR)/,$(LIBOBJ:.o=.c)) #(SRCDIR)/numbdbl.c
#-----------------------------------------------------------------------------
-include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT)
--include make/local/make.$(HOSTNAME)
--include make/local/make.$(HOSTNAME).$(COMP)
--include make/local/make.$(HOSTNAME).$(COMP).$(OPT)
+#include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT)
+#-include make/local/make.$(HOSTNAME)
+#-include make/local/make.$(HOSTNAME).$(COMP)
+#-include make/local/make.$(HOSTNAME).$(COMP).$(OPT)
#-----------------------------------------------------------------------------
FLAGS += $(USRFLAGS)
@@ -157,15 +160,12 @@
cd $(dir $@) && ln -s $(notdir $(BINARY)) $(notdir $@)
$(BINARY): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARY)
- @echo "-> linking $@"
$(CC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME) $(LDFLAGS) -o $@
$(BINARYDBL): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARYDBL)
- @echo "-> linking $@"
$(CC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME).dbl $(LDFLAGS) -o $@
$(LIBRARY): $(OBJDIR) $(LIBDIR) $(LIBXXX)
- @echo "-> generating library $@"
-rm -f $(LIBRARY)
$(AR) $@ $(LIBXXX) $(ARFLAGS)
$(RANLIB) $@
@@ -173,17 +173,14 @@
libdbl: $(LIBRARYDBL) $(LIBDBLLINK)
$(LIBRARYDBL): $(OBJDIR) $(LIBDIR) $(LIBDBLXXX)
- @echo "-> generating library $@"
-rm -f $(LIBRARYDBL)
$(AR) $@ $(LIBDBLXXX) $(ARFLAGS)
$(RANLIB) $@
$(SRCDIR)/mmlparse2.c: $(SRCDIR)/mmlparse2.y $(SRCDIR)/mme.h
- @echo "-> generating yacc parser $@"
$(YACC) $(YFLAGS) -o $@ $<
$(SRCDIR)/mmlscan.c: $(SRCDIR)/mmlscan.l $(SRCDIR)/mme.h
- @echo "-> generating lex scanner $@"
$(LEX) $(LFLAGS) -o$@ $<
lint: $(OBJSRC) $(LIBSRC)
@@ -215,19 +212,16 @@
-rm gcov/z.capture
$(OBJDIR):
- @echo "** creating directory \"$@\""
- @-mkdir -p $(OBJDIR)
+ -mkdir -p $(OBJDIR)
$(LIBDIR):
- @echo "** creating directory \"$@\""
- @-mkdir -p $(LIBDIR)
+ -mkdir -p $(LIBDIR)
$(BINDIR):
- @echo "** creating directory \"$@\""
- @-mkdir -p $(BINDIR)
+ -mkdir -p $(BINDIR)
clean:
- -rm -rf $(OBJDIR)/* $(BINARY) $(LIBRARY) $(LIBRARYDBL) $(LIBLINK) $(BINLINK) $(BINSHORTLINK)
+ -rm -rf $(OBJDIR) $(BINDIR) $(LIBDIR)
depend:
$(SHELL) -ec '$(DCC) $(DFLAGS) $(CPPFLAGS) $(OBJSRC) $(LIBSRC) \
@@ -237,7 +231,6 @@
-include $(DEPEND)
$(OBJDIR)/%.o: $(SRCDIR)/%.c
- @echo "-> compiling $@"
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
# --- EOF ---------------------------------------------------------------------
--- a/check/check.sh
+++ b/check/check.sh
@@ -198,10 +198,12 @@
rm $NAME.err
done 2>/dev/null
-if [ $PASS -eq $COUNT ] ; then echo All $PASS tests passed;
-else echo FAILURE! Only $PASS of $COUNT tests passed;
+if [ $PASS -ne $COUNT ] ; then
+ echo FAILURE! Only $PASS of $COUNT tests passed
+ exit 1
fi
+echo All $PASS tests passed
|
