Bug fix for yesterday's change, which worked in a production system

[users/jgh/exim.git] / src / scripts / MakeLinks

diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index d4561ac39d84301b20c3289a35e4e9e9d03dcdba..ad413772542615381bb2a5f5d23a998b22dbdb72 100755 (executable)
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# $Cambridge: exim/src/scripts/MakeLinks,v 1.10 2007/01/23 15:08:45 ph10 Exp $
+# $Cambridge: exim/src/scripts/MakeLinks,v 1.17 2009/11/13 15:58:17 nm4 Exp $

 
 # Script to build links for all the exim source files from the system-
 # specific build directory. It should be run from within that directory.
 
 # Script to build links for all the exim source files from the system-
 # specific build directory. It should be run from within that directory.


@@ -25,32 +25,7 @@ echo ""
 echo ">>> Creating links to source files..."
 
 
 echo ">>> Creating links to source files..."
 
 

-# The PCRE regular expression library sources have to be linked
-# independently in their own sub-directory, since their .o files
-# are built using their own Makefile in the sub-directory.
-mkdir pcre
-cd pcre
-ln -s ../../src/pcre/Makefile            Makefile
-ln -s ../../src/pcre/config.h            config.h
-ln -s ../../src/pcre/dftables.c          dftables.c
-ln -s ../../src/pcre/pcre_internal.h     pcre_internal.h
-ln -s ../../src/pcre/pcre.h              pcre.h
-ln -s ../../src/pcre/pcre_maketables.c   pcre_maketables.c
-ln -s ../../src/pcre/pcre_config.c       pcre_config.c
-ln -s ../../src/pcre/pcre_get.c          pcre_get.c
-ln -s ../../src/pcre/pcre_globals.c      pcre_globals.c
-ln -s ../../src/pcre/pcre_newline.c      pcre_newline.c
-ln -s ../../src/pcre/pcre_compile.c      pcre_compile.c
-ln -s ../../src/pcre/pcre_exec.c         pcre_exec.c
-ln -s ../../src/pcre/pcre_fullinfo.c     pcre_fullinfo.c
-ln -s ../../src/pcre/pcretest.c          pcretest.c
-ln -s ../../src/pcre/pcre_printint.src   pcre_printint.src
-ln -s ../../src/pcre/pcre_study.c        pcre_study.c
-ln -s ../../src/pcre/pcre_tables.c       pcre_tables.c
-ln -s ../../src/pcre/pcre_try_flipped.c  pcre_try_flipped.c
-ln -s ../../src/pcre/pcre_version.c      pcre_version.c
-ln -s ../../src/pcre/ucp.h               ucp.h
-cd ..
+# PCRE is no longer part of the source distribution, so is no longer linked

 
 # Likewise for the lookups
 mkdir lookups
 
 # Likewise for the lookups
 mkdir lookups


@@ -95,6 +70,7 @@ ln -s ../../src/lookups/whoson.c         whoson.c
 ln -s ../../src/lookups/lf_functions.h   lf_functions.h
 ln -s ../../src/lookups/lf_check_file.c  lf_check_file.c
 ln -s ../../src/lookups/lf_quote.c       lf_quote.c
 ln -s ../../src/lookups/lf_functions.h   lf_functions.h
 ln -s ../../src/lookups/lf_check_file.c  lf_check_file.c
 ln -s ../../src/lookups/lf_quote.c       lf_quote.c

+ln -s ../../src/lookups/lf_sqlperform.c  lf_sqlperform.c

 
 cd ..
 
 
 cd ..
 


@@ -186,6 +162,26 @@ ln -s ../../src/auths/spa.c              spa.c
 ln -s ../../src/auths/spa.h              spa.h
 cd ..
 
 ln -s ../../src/auths/spa.h              spa.h
 cd ..
 

+# Likewise for the code for the PDKIM library
+mkdir pdkim
+cd pdkim
+ln -s ../../src/pdkim/README             README
+ln -s ../../src/pdkim/Makefile           Makefile
+ln -s ../../src/pdkim/base64.c           base64.c
+ln -s ../../src/pdkim/base64.h           base64.h
+ln -s ../../src/pdkim/bignum.c           bignum.c
+ln -s ../../src/pdkim/bignum.h           bignum.h
+ln -s ../../src/pdkim/bn_mul.h           bn_mul.h
+ln -s ../../src/pdkim/pdkim.c            pdkim.c
+ln -s ../../src/pdkim/pdkim.h            pdkim.h
+ln -s ../../src/pdkim/rsa.c              rsa.c
+ln -s ../../src/pdkim/rsa.h              rsa.h
+ln -s ../../src/pdkim/sha1.c             sha1.c
+ln -s ../../src/pdkim/sha1.h             sha1.h
+ln -s ../../src/pdkim/sha2.c             sha2.c
+ln -s ../../src/pdkim/sha2.h             sha2.h
+cd ..
+

 # The basic source files for Exim and utilities. NB local_scan.h gets linked,
 # but local_scan.c does not, because its location is taken from the build-time
 # configuration. Likewise for the os.c file, which gets build dynamically.
 # The basic source files for Exim and utilities. NB local_scan.h gets linked,
 # but local_scan.c does not, because its location is taken from the build-time
 # configuration. Likewise for the os.c file, which gets build dynamically.


@@ -256,6 +252,8 @@ ln -s ../src/transport.c       transport.c
 ln -s ../src/tree.c            tree.c
 ln -s ../src/verify.c          verify.c
 ln -s ../src/version.c         version.c
 ln -s ../src/tree.c            tree.c
 ln -s ../src/verify.c          verify.c
 ln -s ../src/version.c         version.c

+ln -s ../src/dkim.c            dkim.c
+ln -s ../src/dkim.h            dkim.h

 
 # WITH_CONTENT_SCAN
 ln -s ../src/spam.c            spam.c
 
 # WITH_CONTENT_SCAN
 ln -s ../src/spam.c            spam.c


@@ -277,7 +275,8 @@ ln -s ../src/spf.c             spf.c
 ln -s ../src/spf.h             spf.h
 ln -s ../src/srs.c             srs.c
 ln -s ../src/srs.h             srs.h
 ln -s ../src/spf.h             spf.h
 ln -s ../src/srs.c             srs.c
 ln -s ../src/srs.h             srs.h

-ln -s ../src/dk.c              dk.c
-ln -s ../src/dk.h              dk.h
+ln -s ../src/dcc.c             dcc.c
+ln -s ../src/dcc.h             dcc.h
+

 
 # End of MakeLinks
 
 # End of MakeLinks