From c475a462231cd10d4dc14a21d51d2e79b71b029f Mon Sep 17 00:00:00 2001 From: Mark Laws Date: Sun, 21 Jan 2018 01:14:49 +0900 Subject: [PATCH] Unquiet build process --- testsuite/build.mk | 8 ++++---- testsuite/check.mk | 2 +- testsuite/eval.mk | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testsuite/build.mk b/testsuite/build.mk index 18291b6..54774b3 100644 --- a/testsuite/build.mk +++ b/testsuite/build.mk @@ -20,14 +20,14 @@ GHCFLAGS= -rdynamic -O0 -cpp -fglasgow-exts all: $(BIN) $(BIN) : $(PRIOR_OBJS) $(API_OBJ) $(SRC) $(EXTRA_OBJS) - @rm -f $@ - @$(GHC) --make -o $@ $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) $(API) $(SRC) + rm -f $@ + $(GHC) --make -o $@ $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) $(API) $(SRC) # Standard suffix rules .o.hi: - @: + : .hs.o: $(API_OBJ) - @$(GHC) $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) -c $< + $(GHC) $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) -c $< clean: find . -name '*~' -exec rm {} \; diff --git a/testsuite/check.mk b/testsuite/check.mk index b07d859..2ad08d9 100644 --- a/testsuite/check.mk +++ b/testsuite/check.mk @@ -1,7 +1,7 @@ include $(TOP)/config.mk check: $(BIN) - @(cd $(BINDIR) ;\ + (cd $(BINDIR) ;\ expected="expected" ;\ if [ -f "expected" -o -f "expected.$(GLASGOW_HASKELL)" ] ;\ then \ diff --git a/testsuite/eval.mk b/testsuite/eval.mk index 93000b4..ae61c09 100644 --- a/testsuite/eval.mk +++ b/testsuite/eval.mk @@ -12,14 +12,14 @@ REALBIN= ./$(BIN) all: $(BIN) $(BIN): $(SRC) $(OBJS) - @rm -f $@ - @$(GHC) --make -fglasgow-exts $(GHCFLAGS) $(PKGFLAGS) $(EXTRAFLAGS) $(SRC) + rm -f $@ + $(GHC) --make -fglasgow-exts $(GHCFLAGS) $(PKGFLAGS) $(EXTRAFLAGS) $(SRC) # Standard suffix rules .o.hi: - @: + : .hs.o: - @$(GHC) $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) -c $< + $(GHC) $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) -c $< clean: - @rm -rf *.hi *.o *~ $(BIN) + rm -rf *.hi *.o *~ $(BIN)