Author: Joachim Reichel <reichel@debian.org>
Description: Fix build system to work with debian/rules.
Fail if not all tests pass.
Index: zimpl-3.3.4/Makefile
===================================================================
--- zimpl-3.3.4.orig/Makefile
+++ zimpl-3.3.4/Makefile
@@ -55,9 +55,11 @@ ZLIB		=	true
 LINK		=	static
 OPT		=	opt
 COMP		=	gnu
+ifndef
 CC		   =	gcc
+endif
 CC_o	   = -o
-LINKCC   =	gcc
+LINKCC   =	$(CC)
 LINKCC_o =	 -o #the white space is important
 LIBEXT	= .a
 YACC		=	bison
@@ -76,9 +78,10 @@ SRCDIR		=	src
 BINDIR		=	bin
 LIBDIR		=	lib
 
-CPPFLAGS	=	-I$(SRCDIR) -DVERSION='"$(VERSION)"'
-CFLAGS		=	-O
-LDFLAGS		=	-lgmp -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		=	
@@ -103,7 +106,7 @@ LINK		=	static
 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)
@@ -140,10 +143,10 @@ OBJSRC		=	$(addprefix $(SRCDIR)/,$(OBJEC
 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)
@@ -174,19 +177,16 @@ $(BINLINK) $(BINSHORTLINK):	$(BINARY)
 		cd $(dir $@) && ln -s $(notdir $(BINARY)) $(notdir $@)
 
 $(BINARY):	$(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARY) 
-		@echo "-> linking $@"
 ifeq ($(COMP), msvc)
 		$(LINKCC) $(CFLAGS) $(OBJXXX) $(LIBRARY) $(LDFLAGS) $(LINKCC_o)$@
 else
 		$(LINKCC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME) $(LDFLAGS) $(LINKCC_o)$@
 endif
 
 $(BINARYDBL):	$(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARYDBL) 
-		@echo "-> linking $@"
 		$(LINKCC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME).dbl $(LDFLAGS) $(CC_o)$@
 
 $(LIBRARY):	$(OBJDIR) $(LIBDIR) $(LIBXXX) 
-		@echo "-> generating library $@"
 		-rm -f $(LIBRARY)
 		$(AR) $(AR_o)$@ $(LIBXXX) $(ARFLAGS)
 ifneq ($(RANLIB),)
@@ -196,17 +197,14 @@ endif
 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)
@@ -241,19 +239,16 @@ coverage:
 		-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) \
@@ -263,7 +258,6 @@ depend:
 -include	$(DEPEND)
 
 $(OBJDIR)/%.o:	$(SRCDIR)/%.c
-		@echo "-> compiling $@"
 		$(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(CC_o)$@
 
 # --- EOF ---------------------------------------------------------------------
Index: zimpl-3.3.4/check/check.sh
===================================================================
--- zimpl-3.3.4.orig/check/check.sh
+++ zimpl-3.3.4/check/check.sh
@@ -199,7 +199,7 @@ do
 done 2>/dev/null
 
 if [ $PASS -eq $COUNT ] ; then echo All $PASS tests passed; 
-else echo FAILURE! Only $PASS of $COUNT tests passed; 
+else echo FAILURE! Only $PASS of $COUNT tests passed; exit 1;
 fi
 
 
