libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* Makefile.in: Exit immediately if a sub-make fails.

This commit is contained in:
Christopher Faylor 2001-12-14 18:23:19 +00:00
parent bdc7392ce3
commit 94597cd05f
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/ChangeLog
View File

@ -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> 2001-11-04 Christopher Faylor <cgf@redhat.com>
* Makefile.in: Force configure in testsuite directory if config.status * Makefile.in: Force configure in testsuite directory if config.status

10
winsup/Makefile.common
View File

@ -52,6 +52,10 @@ else
endif endif
endif endif
zlib_source:=$(updir)/zlib
zlib_build:=$(bupdir)/zlib
bz2lib_source:=$(updir)/bz2lib
bz2lib_build:=$(bupdir)/bz2lib
w32api_source:=$(updir)/w32api w32api_source:=$(updir)/w32api
w32api_build:=$(bupdir)/w32api w32api_build:=$(bupdir)/w32api
ifeq (,${findstring $(w32api_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) ifeq (,${findstring $(w32api_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
@ -157,6 +161,12 @@ $(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c
$(w32api_lib)/%.a: $(w32api_lib)/Makefile $(w32api_lib)/%.a: $(w32api_lib)/Makefile
@$(MAKE) --no-print-dir -C $(@D) $(@F) @$(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: all:
# For auto-rebuilding the Makefile # For auto-rebuilding the Makefile

10
winsup/Makefile.in
View File

@ -67,17 +67,17 @@ info:
$(SUBDIRS): $(SUBDIRS):
@if cd $@ 2>/dev/null; then \ @if cd $@ 2>/dev/null; then \
$(MAKE) all; \ $(MAKE) all || exit 1; \
fi || exit 0 fi || exit 0
$(INSTALL_SUBDIRS): $(INSTALL_SUBDIRS):
@if cd ${patsubst install_%,%,$@} 2>/dev/null; then \ @if cd ${patsubst install_%,%,$@} 2>/dev/null; then \
$(MAKE) install; \ $(MAKE) install || exit 1; \
fi || exit 0 fi || exit 0
$(CLEAN_SUBDIRS): $(CLEAN_SUBDIRS):
@if cd ${patsubst clean_%,%,$@} 2>/dev/null; then \ @if cd ${patsubst clean_%,%,$@} 2>/dev/null; then \
$(MAKE) clean; \ $(MAKE) clean || exit 1; \
fi || exit 0 fi || exit 0
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -107,7 +107,7 @@ mingw: w32api
cygwin: w32api cygwin: w32api
cinstall: mingw cinstall: mingw bz2lib zlib
install_utils: cygwin mingw install_utils: cygwin mingw
@ -115,4 +115,4 @@ install_mingw: w32api
install_cygwin: w32api install_cygwin: w32api
install_cinstall: mingw install_cinstall: mingw bz2lib zlib

3
winsup/configure vendored
View File

@ -920,6 +920,7 @@ SUBDIRS='w32api cygwin mingw'
case "$with_cross_host" in case "$with_cross_host" in
""|*cygwin*) ""|*cygwin*)
test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib" test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall"
# test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth" # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
SUBDIRS="$SUBDIRS utils doc" SUBDIRS="$SUBDIRS utils doc"
@ -930,7 +931,7 @@ subdirs="$SUBDIRS"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 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_%'` 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 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6

1
winsup/configure.in
View File

@ -70,6 +70,7 @@ SUBDIRS='w32api cygwin mingw'
case "$with_cross_host" in case "$with_cross_host" in
""|*cygwin*) ""|*cygwin*)
test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib" test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall"
# test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth" # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
SUBDIRS="$SUBDIRS utils doc" SUBDIRS="$SUBDIRS utils doc"