X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/aa41d2de89da4bf43d52fd12a191742ff9b668a0..c5537c6e21da5c92ab74fc567f663becc59d3f07:/src/src/pcre/Makefile

diff --git a/src/src/pcre/Makefile b/src/src/pcre/Makefile
index 067bfcdfb..3979a365c 100644
--- a/src/src/pcre/Makefile
+++ b/src/src/pcre/Makefile
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/pcre/Makefile,v 1.6 2006/11/07 16:50:36 ph10 Exp $
+# $Cambridge: exim/src/src/pcre/Makefile,v 1.9 2007/06/29 08:49:17 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
@@ -13,8 +13,8 @@ RANLIB = @true
 
 ##############################################################################
 
-OBJ = pcre_maketables.o chartables.o pcre_fullinfo.o pcre_get.o \
-      pcre_globals.o pcre_compile.o pcre_config.o pcre_exec.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
 
 all:            libpcre.a ../pcretest
@@ -29,9 +29,9 @@ 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) pcre_chartables.c
 
 pcre_compile.o: pcre_compile.c config.h pcre.h pcre_internal.h Makefile
 		@echo "$(CC) pcre_compile.c"
@@ -41,12 +41,12 @@ 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
 
-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
 
 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
@@ -61,6 +61,10 @@ 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
 
+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
+
 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
@@ -79,15 +83,6 @@ pcre_version.o: pcre_version.c config.h pcre.h pcre_internal.h Makefile
 
 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
+		$(FE)$(CC) -c -DNOPOSIX -DNODFA -DNOUTF8 -DNOINFOCHECK $(CFLAGS) pcretest.c
 
 # End