summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/build.mk30
-rw-r--r--build/build2.mk2
-rwxr-xr-xbuild/buildcheck.sh10
-rwxr-xr-xbuild/config-stubs2
-rw-r--r--build/genif.sh2
-rw-r--r--build/mkdep.awk2
6 files changed, 28 insertions, 20 deletions
diff --git a/build/build.mk b/build/build.mk
index c6f68028f..51961f66b 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -1,7 +1,7 @@
# +----------------------------------------------------------------------+
# | PHP Version 5 |
# +----------------------------------------------------------------------+
-# | Copyright (c) 1997-2007 The PHP Group |
+# | Copyright (c) 1997-2006 The PHP Group |
# +----------------------------------------------------------------------+
# | This source file is subject to version 3.01 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is |
@@ -14,15 +14,13 @@
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: build.mk,v 1.26.2.2.2.2.2.1 2008/03/17 15:22:22 gwynne Exp $
+# $Id: build.mk 287074 2009-08-11 02:21:09Z dsp $
#
#
# Makefile to generate build tools
#
-ZENDDIR = Zend
-
-SUBDIRS = $(ZENDDIR) TSRM
+SUBDIRS = Zend TSRM
STAMP = buildmk.stamp
@@ -33,11 +31,10 @@ all: $(STAMP) $(ALWAYS)
@$(MAKE) -s -f build/build2.mk
generated_lists:
- @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
- TSRM/Makefile.am > $@
- @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
- @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
- $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+ @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
+ @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+ @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+ Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
$(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)
@@ -67,7 +64,18 @@ snapshot:
cvsclean-work:
@for i in `find . -name .cvsignore`; do \
- (cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v config.nice | sed 's/[[:space:]]/ /g'` *.o *.a .libs || true); \
+ (cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v config.nice | sed 's/[[:space:]]/ /g'` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
+ done
+
+svnclean-work:
+ @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+ (cd $$i 2>/dev/null && rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done
+gitclean-work:
+ @if (test ! -f '.git/info/exclude' || grep -s "git-ls-files" .git/info/exclude); then \
+ (echo "Rebuild .git/info/exclude" && echo '*.o' > .git/info/exclude && git svn propget svn:ignore | grep -v config.nice >> .git/info/exclude); \
+ fi; \
+ git clean -X -f -d;
+
.PHONY: $(ALWAYS) snapshot
diff --git a/build/build2.mk b/build/build2.mk
index 19eed1b40..050f3763f 100644
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: build2.mk,v 1.37.2.2.2.1 2007/01/01 19:32:10 iliaa Exp $
+# $Id: build2.mk 226204 2007-01-01 19:32:10Z iliaa $
#
include generated_lists
diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index 388130760..4d76bf24d 100755
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -16,7 +16,7 @@
# | Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: buildcheck.sh,v 1.37.2.2.2.1 2007/01/01 19:32:10 iliaa Exp $
+# $Id: buildcheck.sh,v 1.37.2.2.2.1 2007-01-01 19:32:10 iliaa Exp $
#
echo "buildconf: checking installation..."
@@ -33,14 +33,14 @@ ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//'
if test -z "$ac_version"; then
echo "buildconf: autoconf not found."
echo " You need autoconf version 2.13 or newer installed"
-echo " to build PHP from CVS."
+echo " to build PHP from SVN."
exit 1
fi
IFS=.; set $ac_version; IFS=' '
if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
echo "buildconf: autoconf version $ac_version found."
echo " You need autoconf version 2.13 or newer installed"
-echo " to build PHP from CVS."
+echo " to build PHP from SVN."
exit 1
else
echo "buildconf: autoconf version $ac_version (ok)"
@@ -48,9 +48,9 @@ fi
if test "$1" = "2" && test "$2" -ge "50"; then
echo "buildconf: Your version of autoconf likely contains buggy cache code."
- echo " Running cvsclean for you."
+ echo " Running vcsclean for you."
echo " To avoid this, install autoconf-2.13."
- ./cvsclean
+ ./vcsclean
stamp=
fi
diff --git a/build/config-stubs b/build/config-stubs
index 341ac8e3d..04f4eaa19 100755
--- a/build/config-stubs
+++ b/build/config-stubs
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: config-stubs,v 1.1 2003/01/28 10:59:10 sniper Exp $
+# $Id: config-stubs 242949 2007-09-26 15:44:16Z cvs2svn $
dir=$1; shift
for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do
diff --git a/build/genif.sh b/build/genif.sh
index 28d18ebb4..61d1f0045 100644
--- a/build/genif.sh
+++ b/build/genif.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-# $Id: genif.sh,v 1.6 2005/06/21 13:47:38 sniper Exp $
+# $Id: genif.sh,v 1.6 2005-06-21 13:47:38 sniper Exp $
# replacement for genif.pl
infile=$1
diff --git a/build/mkdep.awk b/build/mkdep.awk
index e77056c23..36238c6ca 100644
--- a/build/mkdep.awk
+++ b/build/mkdep.awk
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: mkdep.awk,v 1.8.2.1 2006/01/01 12:50:00 sniper Exp $
+# $Id: mkdep.awk 204189 2006-01-01 12:51:34Z sniper $
#
# Usage:
#
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-16 00:21:01 +0000