remove legacy expr NMake makefile and Makefile.orig

Maintaining three build systems is already more work than is manageable.
Maintaining four does not seem desirable.

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 16371633d1b919ac286f2961721ee5e52e8505bc..7e07b9a3cc4047e051692f394d2af6a062d9d8fb 100644 (file)
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -58,7 +58,6 @@ endif
 endif
 
 EXTRA_DIST = $(man_MANS) $(pdf) \
-       Makefile.nmake Makefile.orig \
        exparse.c \
        y.tab.c y.tab.h y.output expr.vcxproj*
 

diff --git a/lib/expr/Makefile.nmake b/lib/expr/Makefile.nmake
deleted file mode 100644 (file)
index d097d63..0000000
--- a/lib/expr/Makefile.nmake
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * expression library
- */
-
-
-.SOURCE.h : ../ast /home/erg/src/gviz/build/sgi.mips3/include
-
-CCFLAGS = $(CC.OPTIMIZE) $(CC.SUFFIX.DYNAMIC:@?$(CC.DLL)??)
-
-/* NOTE: -o mam bug in -I for exparse.c if exparse.y not first */
-
-expr 2.0 :LIBRARY: expr.h exlib.h exgram.h exparse.y \
-               excc.c excontext.c exdata.c exeval.c exexpr.c \
-               exerror.c exopen.c extoken.c extype.c \
-               exzero.c
-
-if CC.HOSTTYPE == "*.i386" || "$(-mam)" == "static*"
-exeval.o : .CC.NOOPTIMIZE
-end
-
-exop.h : exparse.h
-       {
-       echo "static const char* exop[] = {"
-       $(SED) -e '/^[  ]*#[    ]*define[       ][      ]*[A-Z]/!d' -e 's/^[    ]*#[    ]*define[       ]*\([A-Z0-9_]*\).*/     "\1",/'
-       echo "};"
-       } < $(*) > $(<)
-
-$(INCLUDEDIR) :INSTALLPROTO: expr.h
-
-$(INCLUDEDIR) :INSTALLDIR: exparse.h
-
-YACCFIX.exparse = ex
-
-/*
- * NOTE: the solaris yacc botches the yyact[] indices (large positive)
- */
-
-YACC.BOTCH.PATTERN = ',[0-9][0-9][0-9][0-9][0-9]*,'
-
-YACC.BOTCH.FIX : .VIRTUAL .FORCE .AFTER
-       if      $(GREP) -c $(YACC.BOTCH.PATTERN) $(<<:N=*.c) >/dev/null
-       then    : $(YACC) is botched : yyact indices are bogus :
-               $(CP) $(<<:N=*.c:/^/O/:T=F) $(<<:N=*.c)
-               $(CP) $(<<:N=*.h:/^/O/:T=F) $(<<:N=*.h)
-       else    for i in $(<<:N=*.h) $(<<:N=*.c)
-               do      $(SED) -e '1i\
-/* : : generated by a yacc that works -- solaris take note : : */' -e '/^[     ]*#[    ]*[il][di][en][ne][t]*[         ]["0-9].*/s,,/* & */,' -e '/^[  ]*#[    ]*include[      ]*"exlib\.h"/i\
-#ifndef gettxt\
-#define gettxt(h,t)    (t)\
-#endif' $i > O$i
-               done
-       fi
-
-%.c %.h : %.y YACC.BOTCH.FIX
-
-:SAVE: Oexparse.c Oexparse.h

diff --git a/lib/expr/Makefile.orig b/lib/expr/Makefile.orig
deleted file mode 100644 (file)
index b44a0ba..0000000
--- a/lib/expr/Makefile.orig
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * expression library
- */
-
-:PACKAGE: ast
-
-LICENSE = since=1989,author=kpv
-
-CCFLAGS = $(CC.OPTIMIZE) $(CC.SUFFIX.DYNAMIC:@?$(CC.DLL)??)
-
-/* NOTE: -o mam bug in -I for exparse.c if exparse.y not first */
-
-expr 2.0 :LIBRARY: expr.h exlib.h exgram.h exparse.y \
-               excc.c excontext.c exdata.c exeval.c exexpr.c \
-               exerror.c exopen.c exrewind.c extoken.c extype.c \
-               exzero.c
-
-if CC.HOSTTYPE == "*.i386" || "$(-mam)" == "static*"
-exeval.o : .CC.NOOPTIMIZE
-end
-
-exop.h : exparse.h
-       {
-       echo "static const char* exop[] = {"
-       $(SED) -e '/^[  ]*#[    ]*define[       ][      ]*[A-Z]/!d' -e 's/^[    ]*#[    ]*define[       ]*\([A-Z0-9_]*\).*/     "\1",/'
-       echo "};"
-       } < $(*) > $(<)
-
-$(INCLUDEDIR) :INSTALLPROTO: expr.h
-
-$(INCLUDEDIR) :INSTALLDIR: exparse.h
-
-YACCFIX.exparse = ex
-
-/*
- * NOTE: the solaris yacc botches the yyact[] indices (large positive)
- */
-
-YACC.BOTCH.PATTERN = ',[0-9][0-9][0-9][0-9][0-9]*,'
-
-YACC.BOTCH.FIX : .VIRTUAL .FORCE .AFTER
-       if      $(GREP) -c $(YACC.BOTCH.PATTERN) $(<<:N=*.c) >/dev/null
-       then    : $(YACC) is botched : yyact indices are bogus :
-               $(CP) $(<<:N=*.c:/^/O/:T=F) $(<<:N=*.c)
-               $(CP) $(<<:N=*.h:/^/O/:T=F) $(<<:N=*.h)
-       else    for i in $(<<:N=*.h) $(<<:N=*.c)
-               do      $(SED) -e '1i\
-/* : : generated by a yacc that works -- solaris take note : : */' -e '/^[     ]*#[    ]*[il][di][en][ne][t]*[         ]["0-9].*/s,,/* & */,' -e '/^[  ]*#[    ]*include[      ]*"exlib\.h"/i\
-#ifndef gettxt\
-#define gettxt(h,t)    (t)\
-#endif' $i > O$i
-               done
-       fi
-
-%.c %.h : %.y YACC.BOTCH.FIX
-
-:SAVE: Oexparse.c Oexparse.h