X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d52120f2b5b5464091a61a47fe881a6e8f6ec09f..64f2600a56e0201f23dd3496a499fff6ef22c0c0:/src/src/pcre/Makefile

diff --git a/src/src/pcre/Makefile b/src/src/pcre/Makefile
index 7079d75f5..400b3c3a5 100644
--- a/src/src/pcre/Makefile
+++ b/src/src/pcre/Makefile
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/pcre/Makefile,v 1.7 2007/01/23 15:08:45 ph10 Exp $
+# $Cambridge: exim/src/src/pcre/Makefile,v 1.8 2007/06/26 11:16:54 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
@@ -8,12 +8,12 @@
 
 AR = ar cq
 CC = gcc -O2 -Wall
-CFLAGS =
+CFLAGS = -I.
 RANLIB = @true
 
 ##############################################################################
 
-OBJ = pcre_maketables.o chartables.o pcre_fullinfo.o pcre_get.o \
+OBJ = pcre_maketables.o pcre_chartables.o pcre_fullinfo.o pcre_get.o \
       pcre_globals.o pcre_compile.o pcre_config.o pcre_exec.o pcre_newline.o \
       pcre_study.o pcre_tables.o pcre_try_flipped.o pcre_version.o
 
@@ -21,7 +21,7 @@ all:            libpcre.a ../pcretest
 
 ../pcretest: libpcre.a pcretest.o
 		@echo "$(CC) -o ../pcretest pcretest.o libpcre.a"
-		$(FE)$(CC) $(CFLAGS) -o ../pcretest pcretest.o libpcre.a
+		$(FE)$(CC) $(CFLAGS) -I. -o ../pcretest pcretest.o libpcre.a
 
 libpcre.a:      $(OBJ)
 		-rm -f libpcre.a
@@ -29,69 +29,60 @@ libpcre.a:      $(OBJ)
 		$(FE)$(AR) libpcre.a $(OBJ)
 		$(RANLIB) libpcre.a
 
-chartables.o:   chartables.c pcre_compile.c config.h pcre.h pcre_internal.h Makefile
-		@echo "$(CC) chartables.c"
-		$(FE)$(CC) -c $(CFLAGS) chartables.c
+pcre_chartables.o:   pcre_chartables.c pcre_compile.c config.h pcre.h pcre_internal.h Makefile
+		@echo "$(CC) pcre_chartables.c"
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_chartables.c
 
 pcre_compile.o: pcre_compile.c config.h pcre.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_compile.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_compile.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_compile.c
 
 pcre_config.o:  pcre_config.c config.h pcre.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_config.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_config.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_config.c
 
-pcre_exec.o:    chartables.c pcre_exec.c config.h pcre.h pcre_internal.h Makefile
+pcre_exec.o:    pcre_chartables.c pcre_exec.c config.h pcre.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_exec.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_exec.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_exec.c
 
 pcre_maketables.o: pcre_maketables.c config.h pcre.h pcre_internal.h Makefile
-		@echo "$(CC) 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
 		@echo "$(CC) pcre_fullinfo.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_fullinfo.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_fullinfo.c
 
 pcre_get.o:     pcre_get.c pcre.h config.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_get.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_get.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_get.c
 
 pcre_globals.o: pcre_globals.c pcre.h config.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_globals.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_globals.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_globals.c
 
 pcre_newline.o: pcre_newline.c pcre.h config.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_newline.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_newline.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_newline.c
 
 pcre_study.o:   pcre_study.c pcre.h config.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_study.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_study.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_study.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
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_tables.c
 
 pcre_try_flipped.o: pcre_try_flipped.c pcre.h config.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_try_flipped.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_try_flipped.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_try_flipped.c
 
 pcre_version.o: pcre_version.c config.h pcre.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_version.c"
-		$(FE)$(CC) -c $(CFLAGS) pcre_version.c
+		$(FE)$(CC) -c $(CFLAGS) -I. pcre_version.c
 
 pcretest.o:     pcretest.c config.h pcre.h pcre_internal.h Makefile
 		@echo "$(CC) pcretest.c"
 		$(FE)$(CC) -c -DNOPOSIX -DNODFA -DNOUTF8 -DNOINFOCHECK $(CFLAGS) -I. pcretest.c
 
-# An auxiliary program makes the default character table source
-
-chartables.c:   dftables
-		./dftables chartables.c
-
-dftables:       dftables.c pcre_maketables.c config.h pcre.h pcre_internal.h Makefile
-		@echo "$(CC) dftables.c"
-		$(FE)$(CC) -o dftables $(CFLAGS) dftables.c
-
 # End