From 3de6d3f3ac24682918fa9d2c3923bb4b5c8f41ae Mon Sep 17 00:00:00 2001 From: sof Date: Thu, 26 Feb 1998 10:17:32 +0000 Subject: [PATCH] [project @ 1998-02-26 10:17:30 by sof] Renamed SRC_HC_{PRE,POST} to HC_{POST,PRE}_OPTS --- mk/opts.mk | 6 +++--- mk/suffix.mk | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mk/opts.mk b/mk/opts.mk index c0cd36e..ba3eaa0 100644 --- a/mk/opts.mk +++ b/mk/opts.mk @@ -5,7 +5,7 @@ # This file defines Make variables for the # option flags for each utility program # -# $Id: opts.mk,v 1.5 1998/01/14 16:09:10 sof Exp $ +# $Id: opts.mk,v 1.6 1998/02/26 10:17:32 sof Exp $ # ################################################################################# @@ -84,8 +84,8 @@ SRC_TEXI2HTML_OPTS +=-menu -verbose -glossary HC_OPTS = $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS) -HC_POST = $(SRC_HC_POST_OPTS) $(WAY$(_way)_HC_POST_OPTS) $($*_HC_POST_OPTS) $(EXTRA_HC_POST_OPTS) -HC_PRE = $(SRC_HC_PRE_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_PRE_OPTS) $(EXTRA_HC_PRE_OPTS) +HC_POST_OPTS = $(SRC_HC_POST_OPTS) $(WAY$(_way)_HC_POST_OPTS) $($*_HC_POST_OPTS) $(EXTRA_HC_POST_OPTS) +HC_PRE_OPTS = $(SRC_HC_PRE_OPTS) $(WAY$(_way)_HC_PRE_OPTS) $($*_HC_PRE_OPTS) $(EXTRA_HC_PRE_OPTS) RUNTEST_OPTS = $(SRC_RUNTEST_OPTS) $(WAY$(_way)_RUNTEST_OPTS) \ $($*_RUNTEST_OPTS) $(EXTRA_RUNTEST_OPTS) diff --git a/mk/suffix.mk b/mk/suffix.mk index 12ad26c..c4c2f7a 100644 --- a/mk/suffix.mk +++ b/mk/suffix.mk @@ -38,18 +38,18 @@ HC_SPLIT_POST = touch $@ HC_PRE__ = $(patsubst %,$(HC_SPLIT_PRE) ; ,$(filter -split-objs,$(HC_OPTS))) HC_POST__ = $(patsubst %,$(HC_SPLIT_POST) ; ,$(filter -split-objs,$(HC_OPTS))) -SRC_HC_POST += $(HC_POST__) -SRC_HC_PRE += $(HC_PRE__) +SRC_HC_POST_OPTS += $(HC_POST__) +SRC_HC_PRE_OPTS += $(HC_PRE__) %.$(way_)o : %.hs - $(SRC_HC_PRE) + $(HC_PRE_OPTS) $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@)) - $(SRC_HC_POST) + $(HC_POST_OPTS) %.$(way_)o : %.lhs - $(SRC_HC_PRE) + $(HC_PRE_OPTS) $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@)) - $(SRC_HC_POST) + $(HC_POST_OPTS) %.$(way_)hc : %.lhs $(RM) $@ @@ -60,9 +60,9 @@ SRC_HC_PRE += $(HC_PRE__) $(HC) $(HC_OPTS) -C $< -o $@ %.$(way_)o : %.$(way_)hc - $(SRC_HC_PRE) + $(HC_PRE_OPTS) $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@)) - $(SRC_HC_POST) + $(HC_POST_OPTS) %.$(way_)hc : %.lhc @$(RM) $@ -- 1.7.10.4