diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/md5/make | 10 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 8 | ||||
| -rw-r--r-- | auto/lib/pcre/patch.Makefile.in | 11 | ||||
| -rw-r--r-- | auto/lib/pcre/patch.config.in (renamed from auto/lib/pcre/patch.config) | 4 | ||||
| -rw-r--r-- | auto/lib/pcre/patch.pcre.in (renamed from auto/lib/pcre/patch.pcre) | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/patch.zlib | 19 |
6 files changed, 28 insertions, 28 deletions
diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 1cca3add7..c844c2938 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -38,7 +38,9 @@ case $PLATFORM in SunOS:*:i86pc) if [ $MD5_ASM = YES ]; then - echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-solaris" >> $MAKEFILE + echo " cd $MD5 \\" >> $MAKEFILE + echo " && \$(MAKE) $MD5_OPT MAKE=\$(MAKE) \\" >> $MAKEFILE + echo " x86-solaris" >> $MAKEFILE else echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE @@ -46,9 +48,11 @@ case $PLATFORM in fi ;; - *:i386) + *:i386 | *:i686) if [ $MD5_ASM = YES ]; then - echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-elf" >> $MAKEFILE + echo " cd $MD5 \\" >> $MAKEFILE + echo " && \$(MAKE) $MD5_OPT MAKE=\$(MAKE) \\" >> $MAKEFILE + echo " x86-elf" >> $MAKEFILE else echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index d4f658eb2..c903687fe 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -28,8 +28,8 @@ esac case $PLATFORM in win32) - cp auto/lib/pcre/patch.pcre $PCRE - cp auto/lib/pcre/patch.config $PCRE + cp auto/lib/pcre/patch.pcre.in $PCRE + cp auto/lib/pcre/patch.config.in $PCRE cp auto/lib/pcre/$makefile $PCRE echo " cd $PCRE" >> $MAKEFILE echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT" >> $MAKEFILE @@ -37,7 +37,11 @@ case $PLATFORM in ;; *) + # the patch allows to run the parallel make jobs + cp auto/lib/pcre/patch.Makefile.in $PCRE + echo " cd $PCRE \\" >> $MAKEFILE + echo " && patch < patch.Makefile.in \\" >> $MAKEFILE echo " && CC=$CC $PCRE_OPT \\" >> $MAKEFILE echo " ./configure --disable-shared \\" >> $MAKEFILE echo " && \$(MAKE)" >> $MAKEFILE diff --git a/auto/lib/pcre/patch.Makefile.in b/auto/lib/pcre/patch.Makefile.in new file mode 100644 index 000000000..1b088ad0c --- /dev/null +++ b/auto/lib/pcre/patch.Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in Thu Mar 11 16:19:09 2004 ++++ Makefile.in Thu Mar 11 16:21:16 2004 +@@ -96,7 +96,7 @@ + OBJ = maketables.@OBJEXT@ get.@OBJEXT@ study.@OBJEXT@ pcre.@OBJEXT@ @POSIX_OBJ@ + LOBJ = maketables.lo get.lo study.lo pcre.lo @POSIX_LOBJ@ + +-all: libpcre.la @POSIX_LIB@ pcretest@EXEEXT@ pcregrep@EXEEXT@ @ON_WINDOWS@ winshared ++all: libpcre.la + + pcregrep@EXEEXT@: libpcre.la pcregrep.@OBJEXT@ @ON_WINDOWS@ winshared + $(LINK) -o pcregrep@EXEEXT@ pcregrep.@OBJEXT@ libpcre.la diff --git a/auto/lib/pcre/patch.config b/auto/lib/pcre/patch.config.in index f2c48c281..d28b6feb1 100644 --- a/auto/lib/pcre/patch.config +++ b/auto/lib/pcre/patch.config.in @@ -1,5 +1,5 @@ ---- config.in.orig Thu Aug 21 14:43:07 2003 -+++ config.in Sun Mar 7 02:37:24 2004 +--- config.in Thu Aug 21 14:43:07 2003 ++++ config.in Sun Mar 7 02:37:24 2004 @@ -28,7 +28,7 @@ found. */ diff --git a/auto/lib/pcre/patch.pcre b/auto/lib/pcre/patch.pcre.in index 3406548b5..c49a68f7b 100644 --- a/auto/lib/pcre/patch.pcre +++ b/auto/lib/pcre/patch.pcre.in @@ -1,5 +1,5 @@ ---- pcre.in.orig Thu Aug 21 14:43:07 2003 -+++ pcre.in Sun Mar 7 02:10:11 2004 +--- pcre.in Thu Aug 21 14:43:07 2003 ++++ pcre.in Sun Mar 7 02:10:11 2004 @@ -10,9 +10,9 @@ /* The file pcre.h is build by "configure". Do not edit it; instead make changes to pcre.in. */ diff --git a/auto/lib/zlib/patch.zlib b/auto/lib/zlib/patch.zlib deleted file mode 100644 index c74101162..000000000 --- a/auto/lib/zlib/patch.zlib +++ /dev/null @@ -1,19 +0,0 @@ ---- msdos/Makefile.w32 Sat Nov 15 13:01:29 2003 -+++ msdos/Makefile.w32 Sat Nov 15 13:02:06 2003 -@@ -10,7 +10,7 @@ - - # ------------- Microsoft Visual C++ 4.0 and later ------------- - MODEL= --CFLAGS=-Ox -GA3s -nologo -W3 -+CFLAGS=-nologo -O2 -Ob1 -Oi -Gs -MT - CC=cl - LD=link - LDFLAGS= -@@ -79,7 +79,6 @@ - $(CC) -c $(CFLAGS) $*.c - - zlib.lib: $(OBJ1) $(OBJ2) -- if exist zlib.lib del zlib.lib - lib /OUT:zlib.lib $(OBJ1) $(OBJ2) - - example.exe: example.obj zlib.lib |