summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-01 12:16:24 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-01 12:16:24 +0000
commitb128ab3e555a4f8ccb40450273be35cce60fd525 (patch)
tree1ba8fc5267f7cfde1a1c35165e82f1f612467df5 /Build
parentd23f168a1eae3fe44920853473b2cb3d959c9532 (diff)
new build system: fixed libs/gd/ header and texk/web2c/ctangleboot parallel build problems
git-svn-id: svn://tug.org/texlive/trunk@12590 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/gd/Makefile.am1
-rw-r--r--Build/source/libs/gd/Makefile.in2
-rwxr-xr-xBuild/source/libs/gd/configure46
-rw-r--r--Build/source/libs/gd/configure.ac3
-rw-r--r--Build/source/texk/web2c/Makefile.in4
-rw-r--r--Build/source/texk/web2c/am/bootstrap.am9
6 files changed, 7 insertions, 58 deletions
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index 4804de5b81f..c972c77881e 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -94,6 +94,5 @@ distclean-local:
## Eventually delete these files
##
-
EXTRA_DIST += Makefile.in.orig configure.in.orig
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index 9cae4be3dc3..2d8d22b862e 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -52,7 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = gd.h
+CONFIG_CLEAN_FILES =
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
ARFLAGS = cru
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index 0c1d5a4950e..dea77b6ccd0 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -5367,9 +5367,6 @@ fi
GD_TREE=gd-2.0.35
-ac_config_links="$ac_config_links gd.h:$GD_TREE/gd.h"
-
-
ac_config_files="$ac_config_files Makefile"
@@ -5847,7 +5844,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-config_links="$ac_config_links"
config_commands="$ac_config_commands"
_ACEOF
@@ -5876,9 +5872,6 @@ $config_files
Configuration headers:
$config_headers
-Configuration links:
-$config_links
-
Configuration commands:
$config_commands
@@ -6012,7 +6005,6 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
- "gd.h") CONFIG_LINKS="$CONFIG_LINKS gd.h:$GD_TREE/gd.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -6029,7 +6021,6 @@ done
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
- test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
@@ -6327,7 +6318,7 @@ $as_echo "$as_me: error: could not setup config headers machinery" >&2;}
fi # test -n "$CONFIG_HEADERS"
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS"
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
shift
for ac_tag
do
@@ -6661,42 +6652,7 @@ $as_echo X"$_am_arg" |
}
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :L)
- #
- # CONFIG_LINK
- #
-
- if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
- :
- else
- # Prefer the file from the source tree if names are identical.
- if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
- ac_source=$srcdir/$ac_source
- fi
- { $as_echo "$as_me:$LINENO: linking $ac_source to $ac_file" >&5
-$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
-
- if test ! -r "$ac_source"; then
- { { $as_echo "$as_me:$LINENO: error: $ac_source: file not found" >&5
-$as_echo "$as_me: error: $ac_source: file not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
- rm -f "$ac_file"
-
- # Try a relative symlink, then a hard link, then a copy.
- case $srcdir in
- [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
- *) ac_rel_source=$ac_top_build_prefix$ac_source ;;
- esac
- ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
- ln "$ac_source" "$ac_file" 2>/dev/null ||
- cp -p "$ac_source" "$ac_file" ||
- { { $as_echo "$as_me:$LINENO: error: cannot link or copy $ac_source to $ac_file" >&5
-$as_echo "$as_me: error: cannot link or copy $ac_source to $ac_file" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ;;
:C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac
index 2bd49f51610..7897995e417 100644
--- a/Build/source/libs/gd/configure.ac
+++ b/Build/source/libs/gd/configure.ac
@@ -72,9 +72,6 @@ fi
GD_TREE=gd-[]gd_version
AC_SUBST([GD_TREE])
-dnl Use $GD_TREE to exclude $GD_TREE/gd.h from DIST_COMMON
-AC_CONFIG_LINKS([gd.h:$GD_TREE/gd.h])
-
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f58be76c7ed..39a2c00e240 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -7051,7 +7051,7 @@ cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch
CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
stamp-ctangle: ctangleboot.c cwebboot.c
date >stamp-ctangle
-ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch
+ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
mv ctangle.c ctangleboot.c; \
@@ -7071,8 +7071,6 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
else \
cp $(srcdir)/cwebboot.c .; \
fi
- date >stamp-ctangle
- $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
bibtex.c bibtex.h: bibtex-web2c
bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
$(web2c) bibtex
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index 3b91ffe67c5..a4dd05ccc80 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -1,7 +1,7 @@
## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
## Bootstrapping tangle requires making it with itself. We use the opportunity
-## to create an up-to-date tangleboot as well.
+## to create an up-to-date tangleboot.p as well.
bin_PROGRAMS += tangle
nodist_tangle_SOURCES = tangle.c tangle.h
tangle.c tangle.h: tangle-web2c
@@ -53,7 +53,7 @@ tangleboot.p: tangle.web tangle.ch
DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h
## Bootstrapping ctangle requires making it with itself. We use the opportunity
-## to create an up-to-date ctangleboot as well.
+## to create an up-to-date ctangleboot.c and cwebboot.c as well.
bin_PROGRAMS += ctangle
nodist_ctangle_SOURCES = ctangle.c cweb.c
## ctangle.c is a special case, since it is needed to compile itself.
@@ -76,7 +76,8 @@ stamp-ctangle: ctangleboot.c cwebboot.c
## This is not run unless one of the cwebdir/* files is changed.
## Only try to run ./ctangle if it actually exists, otherwise
## just touch ctangleboot.c and/or cwebboot.c and build ctangle.
-ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch
+## We must serialize this.
+ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
mv ctangle.c ctangleboot.c; \
@@ -96,8 +97,6 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
else \
cp $(srcdir)/cwebboot.c .; \
fi
- date >stamp-ctangle
- $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
DISTCLEANFILES += stamp-ctangle
## Tests