Commit 2b5fc848 authored by Per Cederqvist's avatar Per Cederqvist

Merged in changes from R_0_12, Release 0.12 of GNU regex.

parent 0180b1bc
# Makefile for regex.
#
# Copyright (C) 1992 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
version = 0.11
version = 0.12
# Special support for LysKOM
srcdir = @srcdir@
......@@ -56,16 +56,6 @@ doclean: domostlyclean;
domostlyclean:
$(RM) $(GENERIC-MOSTLYCLEAN)
#configure: configure.in
# autoconf
# config.status is generated by @TOPDIR@/configure in the LysKOM distribution.
#config.status: configure
# configure
Makefile: Makefile.in # config.status
sh config.status
makeargs = $(MFLAGS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' CC='$(CC)' \
DEFS='$(DEFS)' LDFLAGS='$(LDFLAGS)' LOADLIBES='$(LOADLIBES)'
......@@ -77,7 +67,7 @@ TAGS check::
# Prevent GNU make 3 from overflowing arg limit on system V.
.NOEXPORT:
distfiles = AUTHORS ChangeLog COPYING NEWS README \
distfiles = AUTHORS ChangeLog COPYING INSTALL NEWS README \
*.in configure regex.c regex.h
distdir = regex-$(version)
distargs = version=$(version) distdir=../$(distdir)/$$d
......
# Makefile for regex.
#
# Copyright (C) 1992 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
version = 0.11
version = 0.12
# Special support for LysKOM
srcdir = @srcdir@
......@@ -56,16 +56,6 @@ doclean: domostlyclean;
domostlyclean:
$(RM) $(GENERIC-MOSTLYCLEAN)
#configure: configure.in
# autoconf
# config.status is generated by @TOPDIR@/configure in the LysKOM distribution.
#config.status: configure
# configure
Makefile: Makefile.in # config.status
sh config.status
makeargs = $(MFLAGS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' CC='$(CC)' \
DEFS='$(DEFS)' LDFLAGS='$(LDFLAGS)' LOADLIBES='$(LOADLIBES)'
......@@ -77,7 +67,7 @@ TAGS check::
# Prevent GNU make 3 from overflowing arg limit on system V.
.NOEXPORT:
distfiles = AUTHORS ChangeLog COPYING NEWS README \
distfiles = AUTHORS ChangeLog COPYING INSTALL NEWS README \
*.in configure regex.c regex.h
distdir = regex-$(version)
distargs = version=$(version) distdir=../$(distdir)/$$d
......
......@@ -37,7 +37,8 @@ default all: regex.info regex.dvi
# We need to include some code from regex.h.
regex.texi: xregex.texi
rm -f $@
gawk -f include.awk -vsource=../$(srcdir)/regex.h <$< \
gawk -f include.awk -vsource=../$(srcdir)/regex.h \
<../$(srcdir)/doc/xregex.texi \
| expand >$@
chmod a-w $@
......@@ -46,10 +47,10 @@ regex.dvi: regex.cps
regex.cps: regex.cp
$(TEXINDEX) regex.??
regex.cp: regex.texi
$(TEX) $<
$(TEX) ../$(srcdir)/doc/regex.texi
regex.info: regex.texi
$(MAKEINFO) $<
$(MAKEINFO) ../$(srcdir)/doc/regex.texi
# I know of no way to make a good TAGS file from Texinfo source.
TAGS:
......
......@@ -37,7 +37,8 @@ default all: regex.info regex.dvi
# We need to include some code from regex.h.
regex.texi: xregex.texi
rm -f $@
gawk -f include.awk -vsource=../$(srcdir)/regex.h <$< \
gawk -f include.awk -vsource=../$(srcdir)/regex.h \
<../$(srcdir)/doc/xregex.texi \
| expand >$@
chmod a-w $@
......@@ -46,10 +47,10 @@ regex.dvi: regex.cps
regex.cps: regex.cp
$(TEXINDEX) regex.??
regex.cp: regex.texi
$(TEX) $<
$(TEX) ../$(srcdir)/doc/regex.texi
regex.info: regex.texi
$(MAKEINFO) $<
$(MAKEINFO) ../$(srcdir)/doc/regex.texi
# I know of no way to make a good TAGS file from Texinfo source.
TAGS:
......
......@@ -61,9 +61,9 @@ regex: $(regex_o) $(common_o) $(test_o) main.o
$(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
# As long as we're doing tests, we enable debugging.
dregex.o: regex.c regex.h
dregex.o: ../regex.c ../regex.h
rm -f $@
$(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c $<
$(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c ../$(srcdir)/regex.c
mv regex.o $@
# iregex is the interactive regex.
......@@ -84,7 +84,7 @@ regexcpp.o: regexcpp.c
regexcpp.c: regex.c regexcpp.sed
rm -f regexcpp.c
$(CC) -E $(ALL_CPPFLAGS) $< \
$(CC) -E $(ALL_CPPFLAGS) ../$(srcdir)/regex.c \
| egrep -v '^#|^ *$$' \
| sed -f regexcpp.sed \
> regexcpp.c
......@@ -92,23 +92,24 @@ regexcpp.c: regex.c regexcpp.sed
# Have to give this malloc special flags.
emacsmalloc.o: emacsmalloc.c
$(CC) -c $(CFLAGS) $(ALL_CPPFLAGS) $(emacsmallocflags) $<
$(CC) -c $(CFLAGS) $(ALL_CPPFLAGS) $(emacsmallocflags) \
../$(srcdir)/test/emacsmalloc.c
syntax: syntax.o
$(CC) $(CFLAGS) $< -o $@
$(CC) $(CFLAGS) -o $@ syntax.o
syntax.c: syntax.skel bits
sed '/\[\[\[replace.*\]\]\]/r bits' syntax.skel > $@
bits: regex.h
sed -n 1,/RE_SYNTAX_EMACS/p $< \
sed -n 1,/RE_SYNTAX_EMACS/p ../$(srcdir)/regex.h \
| grep "#define RE_.*1" \
| sed 's/^#define \(RE_[A-Z_]*\) .*/ TEST_BIT (\1);/' > $@
check: regex
./regex
TAGS: regex.h regex.c *.h *.c
TAGS: regex.c regex.h *.h *.c
$(ETAGS) -t $^
depend:
......
......@@ -61,9 +61,9 @@ regex: $(regex_o) $(common_o) $(test_o) main.o
$(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
# As long as we're doing tests, we enable debugging.
dregex.o: regex.c regex.h
dregex.o: ../regex.c ../regex.h
rm -f $@
$(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c $<
$(CC) $(ALL_CPPFLAGS) $(CFLAGS) -c ../$(srcdir)/regex.c
mv regex.o $@
# iregex is the interactive regex.
......@@ -84,7 +84,7 @@ regexcpp.o: regexcpp.c
regexcpp.c: regex.c regexcpp.sed
rm -f regexcpp.c
$(CC) -E $(ALL_CPPFLAGS) $< \
$(CC) -E $(ALL_CPPFLAGS) ../$(srcdir)/regex.c \
| egrep -v '^#|^ *$$' \
| sed -f regexcpp.sed \
> regexcpp.c
......@@ -92,23 +92,24 @@ regexcpp.c: regex.c regexcpp.sed
# Have to give this malloc special flags.
emacsmalloc.o: emacsmalloc.c
$(CC) -c $(CFLAGS) $(ALL_CPPFLAGS) $(emacsmallocflags) $<
$(CC) -c $(CFLAGS) $(ALL_CPPFLAGS) $(emacsmallocflags) \
../$(srcdir)/test/emacsmalloc.c
syntax: syntax.o
$(CC) $(CFLAGS) $< -o $@
$(CC) $(CFLAGS) -o $@ syntax.o
syntax.c: syntax.skel bits
sed '/\[\[\[replace.*\]\]\]/r bits' syntax.skel > $@
bits: regex.h
sed -n 1,/RE_SYNTAX_EMACS/p $< \
sed -n 1,/RE_SYNTAX_EMACS/p ../$(srcdir)/regex.h \
| grep "#define RE_.*1" \
| sed 's/^#define \(RE_[A-Z_]*\) .*/ TEST_BIT (\1);/' > $@
check: regex
./regex
TAGS: regex.h regex.c *.h *.c
TAGS: regex.c regex.h *.h *.c
$(ETAGS) -t $^
depend:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment