diff options
| -rw-r--r-- | winsup/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/Makefile.common | 10 | ||||
| -rw-r--r-- | winsup/Makefile.in | 10 | ||||
| -rwxr-xr-x | winsup/configure | 3 | ||||
| -rwxr-xr-x | winsup/configure.in | 1 |
5 files changed, 22 insertions, 6 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 7f766b9..4529024 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,7 @@ +2001-12-14 Christopher Faylor <cgf@redhat.com> + + * Makefile.in: Exit immediately if a sub-make fails. + 2001-11-04 Christopher Faylor <cgf@redhat.com> * Makefile.in: Force configure in testsuite directory if config.status diff --git a/winsup/Makefile.common b/winsup/Makefile.common index d81efcb..a6b0cd5 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -52,6 +52,10 @@ else endif endif +zlib_source:=$(updir)/zlib +zlib_build:=$(bupdir)/zlib +bz2lib_source:=$(updir)/bz2lib +bz2lib_build:=$(bupdir)/bz2lib w32api_source:=$(updir)/w32api w32api_build:=$(bupdir)/w32api ifeq (,${findstring $(w32api_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) @@ -157,6 +161,12 @@ $(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c $(w32api_lib)/%.a: $(w32api_lib)/Makefile @$(MAKE) --no-print-dir -C $(@D) $(@F) +$(bz2lib)/%a: $(bz2lib)/Makefile + @$(MAKE) --no-print-dir -C $(@D) $(@F) + +$(zlib)/%a: $(zlib)/Makefile + @$(MAKE) --no-print-dir -C $(@D) $(@F) + all: # For auto-rebuilding the Makefile diff --git a/winsup/Makefile.in b/winsup/Makefile.in index 12ab73b..7ed371e 100644 --- a/winsup/Makefile.in +++ b/winsup/Makefile.in @@ -67,17 +67,17 @@ info: $(SUBDIRS): @if cd $@ 2>/dev/null; then \ - $(MAKE) all; \ + $(MAKE) all || exit 1; \ fi || exit 0 $(INSTALL_SUBDIRS): @if cd ${patsubst install_%,%,$@} 2>/dev/null; then \ - $(MAKE) install; \ + $(MAKE) install || exit 1; \ fi || exit 0 $(CLEAN_SUBDIRS): @if cd ${patsubst clean_%,%,$@} 2>/dev/null; then \ - $(MAKE) clean; \ + $(MAKE) clean || exit 1; \ fi || exit 0 .PRECIOUS: Makefile @@ -107,7 +107,7 @@ mingw: w32api cygwin: w32api -cinstall: mingw +cinstall: mingw bz2lib zlib install_utils: cygwin mingw @@ -115,4 +115,4 @@ install_mingw: w32api install_cygwin: w32api -install_cinstall: mingw +install_cinstall: mingw bz2lib zlib diff --git a/winsup/configure b/winsup/configure index 2d46e34..8cb175b 100755 --- a/winsup/configure +++ b/winsup/configure @@ -920,6 +920,7 @@ SUBDIRS='w32api cygwin mingw' case "$with_cross_host" in ""|*cygwin*) test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib" + test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib" test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth" SUBDIRS="$SUBDIRS utils doc" @@ -930,7 +931,7 @@ subdirs="$SUBDIRS" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:935: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/winsup/configure.in b/winsup/configure.in index 3ee598b..f1195c2 100755 --- a/winsup/configure.in +++ b/winsup/configure.in @@ -70,6 +70,7 @@ SUBDIRS='w32api cygwin mingw' case "$with_cross_host" in ""|*cygwin*) test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib" + test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib" test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth" SUBDIRS="$SUBDIRS utils doc" |