From 638456761a5573015658c4826824539021d14342 Mon Sep 17 00:00:00 2001
From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Fri, 17 Jun 2005 11:33:00 +0000
Subject: [PATCH] Tidy up Exim's PCRE Makefile to generate tidier output like
 the other Exim Makefiles.

---
 src/src/pcre/Makefile | 55 ++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/src/pcre/Makefile b/src/src/pcre/Makefile
index 6ab501a3c..5f6569264 100644
--- a/src/src/pcre/Makefile
+++ b/src/src/pcre/Makefile
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/pcre/Makefile,v 1.3 2005/06/15 08:57:10 ph10 Exp $
+# $Cambridge: exim/src/src/pcre/Makefile,v 1.4 2005/06/17 11:33:00 ph10 Exp $
 
 # Makefile for PCRE (Perl-Compatible Regular Expression) library for use by
 # Exim. This is a tailored Makefile, not the normal one that comes with the
@@ -20,54 +20,70 @@ OBJ = pcre_maketables.o chartables.o pcre_fullinfo.o pcre_get.o \
 all:            libpcre.a ../pcretest
 
 ../pcretest: libpcre.a pcretest.o
-		$(CC) $(CFLAGS) -o ../pcretest pcretest.o libpcre.a
+		@echo "$(CC) -o ../pcretest pcretest.o libpcre.a"
+		$(FE)$(CC) $(CFLAGS) -o ../pcretest pcretest.o libpcre.a
 
 libpcre.a:      $(OBJ)
 		-rm -f libpcre.a
-		$(AR) libpcre.a $(OBJ)
+		@echo "$(AR) libpcre.a"
+		$(FE)$(AR) libpcre.a $(OBJ)
 		$(RANLIB) libpcre.a
 
 chartables.o:   chartables.c pcre_compile.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) chartables.c
+		@echo "$(CC) chartables.c"
+		$(FE)$(CC) -c $(CFLAGS) chartables.c
 
 pcre_compile.o: pcre_compile.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_compile.c
+		@echo "$(CC) pcre_compile.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_compile.c
 
 pcre_config.o:  pcre_config.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_config.c
+		@echo "$(CC) pcre_config.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_config.c
 
 pcre_exec.o:    chartables.c pcre_exec.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_exec.c
+		@echo "$(CC) pcre_exec.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_exec.c
 
 pcre_maketables.o: pcre_maketables.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_maketables.c
+		@echo "$(CC) pcre_maketables.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_maketables.c
 
 pcre_fullinfo.o: pcre_fullinfo.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_fullinfo.c
+		@echo "$(CC) pcre_fullinfo.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_fullinfo.c
 
 pcre_get.o:     pcre_get.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_get.c
+		@echo "$(CC) pcre_get.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_get.c
 
 pcre_globals.:  pcre_globals.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_globals.c
+		@echo "$(CC) pcre_globals.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_globals.c
 
 pcre_printint.o: pcre_printint.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_printint.c
+		@echo "$(CC) pcre_printint.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_printint.c
 
 pcre_study.o:   pcre_study.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_study.c
+		@echo "$(CC) pcre_study.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_study.c
 
-pcre_tables.o:   pcre_tables.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_tables.c
+pcre_tables.o:  pcre_tables.c pcre.h config.h pcre_internal.h Makefile
+		@echo "$(CC) pcre_tables.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_tables.c
 
 pcre_try_flipped.o: pcre_try_flipped.c pcre.h config.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_try_flipped.c
+		@echo "$(CC) pcre_try_flipped.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_try_flipped.c
 
 pcre_version.o: pcre_version.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c $(CFLAGS) pcre_version.c
+		@echo "$(CC) pcre_version.c"
+		$(FE)$(CC) -c $(CFLAGS) pcre_version.c
 
 pcretest.o:     pcretest.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -c -DNOPOSIX -DNODFA -DNOUTF8 -DNOINFOCHECK $(CFLAGS) -I. pcretest.c
+		@echo "$(CC) pcretest.c"
+		$(FE)$(CC) -c -DNOPOSIX -DNODFA -DNOUTF8 -DNOINFOCHECK $(CFLAGS) -I. pcretest.c
 
 # An auxiliary program makes the default character table source
 
@@ -75,6 +91,7 @@ chartables.c:   dftables
 		./dftables chartables.c
 
 dftables:       dftables.c pcre_maketables.c config.h pcre.h pcre_internal.h Makefile
-		$(CC) -o dftables $(CFLAGS) dftables.c
+		@echo "$(CC) dftables.c"
+		$(FE)$(CC) -o dftables $(CFLAGS) dftables.c
 
 # End
-- 
2.25.1