diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-04-09 06:15:43 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-04-09 06:15:43 +0000 |
| commit | 7f363152c55e839596c262b491b747e4d24b0b62 (patch) | |
| tree | d522c7cd364ea963d34f00bae5807dac51b1952d | |
| parent | d5337b4c1301ee68aa243ffbb0acc1ba25686d33 (diff) | |
| download | newlib-7f363152c55e839596c262b491b747e4d24b0b62.zip newlib-7f363152c55e839596c262b491b747e4d24b0b62.tar.gz newlib-7f363152c55e839596c262b491b747e4d24b0b62.tar.bz2 | |
* Makefile.in: Work around MAKEOVERRIDES problem with older versions of make.
* Makefile.common: Ditto.
| -rw-r--r-- | winsup/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/Makefile.common | 8 | ||||
| -rw-r--r-- | winsup/Makefile.in | 14 |
3 files changed, 23 insertions, 5 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index d7ece8a..ce5cad3 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,9 @@ +Sun Apr 9 02:06:49 2000 Christopher Faylor <cgf@cygnus.com> + + * Makefile.in: Work around MAKEOVERRIDES problem with older versions + of make. + * Makefile.common: Ditto. + Fri Apr 7 17:04:02 Ron Parker <rdparker@sourceware.cygnus.com> * configure.in: Added cinstall to the list of subdirs. diff --git a/winsup/Makefile.common b/winsup/Makefile.common index c614342..661a4d7 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -88,7 +88,13 @@ COMPILE_CC:=$(CC) $c -nostdinc $(ALL_CFLAGS) -I$(GCC_INCLUDE) vpath %.a $(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm -unexport MAKEOVERRIDES +MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c} + +ifneq ($(MAKEOVERRIDES_WORKAROUND),) + override MAKE:=$(MAKE) $(MAKEOVERRIDES) + MAKEOVERRIDES:= + export MAKEOVERRIDES +endif .PRECIOUS: %.o diff --git a/winsup/Makefile.in b/winsup/Makefile.in index dcb1263..f29734d 100644 --- a/winsup/Makefile.in +++ b/winsup/Makefile.in @@ -45,7 +45,13 @@ CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)} .SUFFIXES: -unexport MAKEOVERRIDES +MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c} + +ifneq ($(MAKEOVERRIDES_WORKAROUND),) + override MAKE:=$(MAKE) $(MAKEOVERRIDES) + MAKEOVERRIDES:= + export MAKEOVERRIDES +endif all: Makefile $(SUBDIRS) @@ -54,13 +60,13 @@ install: Makefile $(INSTALL_SUBDIRS) clean: $(CLEAN_SUBDIRS) $(SUBDIRS): - @$(MAKE) -C $@ $(MAKEOVERRIDES) all + @$(MAKE) -C $@ all $(INSTALL_SUBDIRS): - @$(MAKE) -C ${patsubst install_%,%,$@} $(MAKEOVERRIDES) install + @$(MAKE) -C ${patsubst install_%,%,$@} install $(CLEAN_SUBDIRS): - @$(MAKE) -C ${patsubst clean_%,%,$@} $(MAKEOVERRIDES) clean + @$(MAKE) -C ${patsubst clean_%,%,$@} clean .PRECIOUS: Makefile |