[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: |
Sun, 28 Apr 2013 15:52:51 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Bernd Warken <bwarken> 13/04/28 15:52:51
Modified files:
. : ChangeLog
src/roff/groff : Makefile.sub
Log message:
src/roff/groff/Makefile.sub: Make this file a compatible Makefile.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1417&r2=1.1418
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1417
retrieving revision 1.1418
diff -u -b -r1.1417 -r1.1418
--- ChangeLog 28 Apr 2013 01:28:07 -0000 1.1417
+++ ChangeLog 28 Apr 2013 15:52:51 -0000 1.1418
@@ -1,4 +1,8 @@
2013-04-28 Bernd Warken <address@hidden>
+
+ * src/roff/groff/Makefile.sub: Make this Makefile compatible.
+
+2013-04-28 Bernd Warken <address@hidden>
2013-04-28 Werner LEMBERG <address@hidden>
* src/roff/groff/Makefile.sub: Use `make' variables to get
Index: src/roff/groff/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/roff/groff/Makefile.sub 28 Apr 2013 01:28:07 -0000 1.9
+++ src/roff/groff/Makefile.sub 28 Apr 2013 15:52:51 -0000 1.10
@@ -5,6 +5,9 @@
# Copyright (C) 1993-2013
# Free Software Foundation, Inc.
+# Rewritten by Bernd Warken <address@hidden> and
+# Werner LEMBERG <address@hidden>
+
# Last update: 28 Apr 2013
# `groff' is free software; you can redistribute it and/or modify it
@@ -31,37 +34,35 @@
CSRCS=$(srcdir)/pipeline.c
HDRS=$(srcdir)/pipeline.h
-GROFF_OPTS_OUTPUT := groff_opts_no_arg.txt \
+GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \
groff_opts_with_arg.txt
-MOSTLYCLEANADD := $(GROFF_OPTS_OUTPUT)
+MOSTLYCLEANADD=$(GROFF_OPTS_OUTPUT)
RM=rm -f
-OPTS := $(shell $(EGREP) -e ':.*:.*:' groff.cpp \
- | sed -e 's/[ \t",]//g')
-
-OPTS_NO_ARG := $(shell echo $(OPTS) \
- | sed -e 's/[a-zA-Z]://g')
-
-OPTS_WITH_ARG := $(shell echo $(OPTS) \
- | sed "s/[$(OPTS_NO_ARG):]//g")
+opts=`$(EGREP) -e ':.*:.*:' groff.cpp \
+ | sed -e 's/[ \t",]//g')`
-show:
- @echo opts: $(OPTS)
- @echo no: $(OPTS_NO_ARG)
- @echo optarg: $(OPTS_WITH_ARG)
+opts_no_arg=`cat groff_opts_no_arg.txt`
.PHONY: all
all: groff.cpp $(GROFF_OPTS_OUTPUT)
-groff_opts_no_arg.txt:
- $(RM) $@
- echo $(OPTS_NO_ARG) > $@
-
-groff_opts_with_arg.txt:
- $(RM) $@
- echo $(OPTS_WITH_ARG) > $@
+groff_opts_no_arg.txt: groff.cpp
+ @$(RM) $@
+ @echo groff options: $(opts)
+ @echo $(opts) \
+ | 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" > $@
+ @echo -n 'with arg: '
+ @cat $@
.PHONY: install_data
install_data: $(GROFF_OPTS_OUTPUT)