aboutsummaryrefslogtreecommitdiffstats
path: root/eqn
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-10-25 16:12:45 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-10-25 16:12:45 +0000
commit6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9 (patch)
tree4c2c4a63a90dbcb77b7e6860bb662b5ddecdedf5 /eqn
parentab1717bb35d85041e0184f79daa1313a1306dc01 (diff)
downloadsrc-6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9.tar.gz
src-6db6db4b7f38f7760b90ec861a39b5ccb9df5ba9.zip
Import heirloom doctools snapshot 20161025vendor/heirloom-doctools/20161025
Notes
Notes: svn path=/vendor/heirloom-doctools/dist/; revision=307921 svn path=/vendor/heirloom-doctools/20161025/; revision=307922; tag=vendor/heirloom-doctools/20161025
Diffstat (limited to 'eqn')
-rw-r--r--eqn/checkeq.d/Makefile.mk4
-rw-r--r--eqn/eqn.d/Makefile.mk4
-rw-r--r--eqn/eqnchar.d/Makefile.mk6
-rw-r--r--eqn/lex.c2
-rw-r--r--eqn/neqn.d/Makefile.mk4
5 files changed, 10 insertions, 10 deletions
diff --git a/eqn/checkeq.d/Makefile.mk b/eqn/checkeq.d/Makefile.mk
index 5e13d2021deb..773061a45dde 100644
--- a/eqn/checkeq.d/Makefile.mk
+++ b/eqn/checkeq.d/Makefile.mk
@@ -4,12 +4,12 @@ OBJ = checkeq.o
FLAGS =
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: checkeq
checkeq: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o checkeq
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o checkeq
install:
$(INSTALL) -c checkeq $(ROOT)$(BINDIR)/checkeq
diff --git a/eqn/eqn.d/Makefile.mk b/eqn/eqn.d/Makefile.mk
index d6e573ce1344..a02ba2525ef6 100644
--- a/eqn/eqn.d/Makefile.mk
+++ b/eqn/eqn.d/Makefile.mk
@@ -6,12 +6,12 @@ OBJ = diacrit.o e.o eqnbox.o font.o fromto.o funny.o glob.o integral.o \
FLAGS = -I. -I.. -I../../include $(DEFINES)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: eqn
eqn: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o eqn
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o eqn
e.c: e.y
$(YACC) -d ../e.y
diff --git a/eqn/eqnchar.d/Makefile.mk b/eqn/eqnchar.d/Makefile.mk
index 6154b87c0596..7ea014187d16 100644
--- a/eqn/eqnchar.d/Makefile.mk
+++ b/eqn/eqnchar.d/Makefile.mk
@@ -1,7 +1,7 @@
FILES = ascii eqnchar greek iso utf-8
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(EUC) -c $<
+ $(CC) $(_CFLAGS) $(EUC) -c $<
all: $(FILES)
@@ -9,10 +9,10 @@ utf-8: genutf8
-./genutf8 >utf-8
genutf8: genutf8.o
- -$(CC) $(CFLAGS) $(LDFLAGS) genutf8.o $(LIBS) -o genutf8
+ -$(CC) $(_CFLAGS) $(_LDFLAGS) genutf8.o $(LIBS) -o genutf8
genutf8.o: genutf8.c
- -$(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(EUC) -c genutf8.c
+ -$(CC) $(_CFLAGS) $(EUC) -c genutf8.c
install: all
test -d $(ROOT)$(PUBDIR) || mkdir -p $(ROOT)$(PUBDIR)
diff --git a/eqn/lex.c b/eqn/lex.c
index 6815801c92d3..d1cd2982c5ed 100644
--- a/eqn/lex.c
+++ b/eqn/lex.c
@@ -299,7 +299,7 @@ include(void) {
void
delim(void) {
yyval.token = eqnreg = 0;
- if (cstr(token, 0, SSIZE) || token[0] & 0200 || token[1] & 0200)
+ if (cstr(token, 0, SSIZE))
error(FATAL, "Bizarre delimiters at %.20s", token);
lefteq = token[0];
righteq = token[1];
diff --git a/eqn/neqn.d/Makefile.mk b/eqn/neqn.d/Makefile.mk
index bb924fcdacf6..cd8f3c6419c7 100644
--- a/eqn/neqn.d/Makefile.mk
+++ b/eqn/neqn.d/Makefile.mk
@@ -6,12 +6,12 @@ OBJ = diacrit.o e.o eqnbox.o font.o fromto.o funny.o glob.o integral.o \
FLAGS = -I. -I.. -I../../include -DNEQN $(DEFINES)
.c.o:
- $(CC) $(CFLAGS) $(WARN) $(CPPFLAGS) $(FLAGS) -c $<
+ $(CC) $(_CFLAGS) $(FLAGS) -c $<
all: neqn
neqn: $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o neqn
+ $(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o neqn
e.c: e.y
$(YACC) -d ../e.y