[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub
From: |
Bernd Warken |
Subject: |
[Groff-commit] groff ChangeLog src/roff/groff/Makefile.sub |
Date: |
Mon, 29 Apr 2013 19:13:54 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Bernd Warken <bwarken> 13/04/29 19:13:54
Modified files:
. : ChangeLog
src/roff/groff : Makefile.sub
Log message:
src/roff/groff/Makefile.sub: Replace some variables by shell
commands. Improve the output for the `make' runs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1418&r2=1.1419
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1418
retrieving revision 1.1419
diff -u -b -r1.1418 -r1.1419
--- ChangeLog 28 Apr 2013 15:52:51 -0000 1.1418
+++ ChangeLog 29 Apr 2013 19:13:54 -0000 1.1419
@@ -1,3 +1,8 @@
+2013-04-29 Bernd Warken <address@hidden>
+
+ * src/roff/groff/Makefile.sub: Replace some variables by shell
+ commands. Improve the output for the `make' runs.
+
2013-04-28 Bernd Warken <address@hidden>
* src/roff/groff/Makefile.sub: Make this Makefile compatible.
@@ -14,7 +19,8 @@
* src/roff/groff/read_groff_options.pl: Remove this file. It's
no longer needed.
- * src/roff/groff/Makefile.sub: Get the `groff' options from the
use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'.
+ * src/roff/groff/Makefile.sub: Get the `groff' options from the
+ use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'.
Store this information in a new file `groff_options.txt', which
is copied to `groff libdir' during the installation.
Index: src/roff/groff/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/roff/groff/Makefile.sub 28 Apr 2013 15:52:51 -0000 1.10
+++ src/roff/groff/Makefile.sub 29 Apr 2013 19:13:54 -0000 1.11
@@ -37,30 +37,31 @@
GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \
groff_opts_with_arg.txt
-MOSTLYCLEANADD=$(GROFF_OPTS_OUTPUT)
+MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
RM=rm -f
-
-opts=`$(EGREP) -e ':.*:.*:' groff.cpp \
- | sed -e 's/[ \t",]//g')`
-
-opts_no_arg=`cat groff_opts_no_arg.txt`
+EGREP=egrep
.PHONY: all
-all: groff.cpp $(GROFF_OPTS_OUTPUT)
+all: groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT)
+
+groff_opts.tmp: groff.cpp
+ @$(EGREP) -e ':.*:.*:' $< \
+ | sed -e 's/[ \t",]//g' > $@
+ @echo -n 'groff options: '
+ @cat $@
-groff_opts_no_arg.txt: groff.cpp
+groff_opts_no_arg.txt: groff_opts.tmp
@$(RM) $@
- @echo groff options: $(opts)
- @echo $(opts) \
+ @cat $< \
| sed -e 's/[a-zA-Z]://g' > $@
@echo -n 'no arg: '
@cat $@
groff_opts_with_arg.txt: groff_opts_no_arg.txt
@$(RM) $@
- @echo $(opts) \
- | sed "s/[$(opts_no_arg):]//g" > $@
+ @cat groff_opts.tmp \
+ | sed "s/[`cat $<`:]//g" > $@
@echo -n 'with arg: '
@cat $@