JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.common: Resolve srcdir to absolute path or it will confuse usages 

when passed to submakes.  Eliminate vestigal use of MAKEOVERRIDES.
This commit is contained in:
Christopher Faylor 2000-04-10 03:51:39 +00:00
parent da7185af44
commit ba87a619ef
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/ChangeLog
View File

@ -1,3 +1,9 @@
Sun Apr 9 23:47:45 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.common: Resolve srcdir to absolute path or it will confuse
usages when passed to submakes. Eliminate vestigal use of
MAKEOVERRIDES.
Sun Apr 9 02:06:49 2000 Christopher Faylor <cgf@cygnus.com> Sun Apr 9 02:06:49 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Work around MAKEOVERRIDES problem with older versions * Makefile.in: Work around MAKEOVERRIDES problem with older versions

9
winsup/Makefile.common
View File

@ -14,7 +14,8 @@ CFLAGS_COMMON:=-Wall -Wwrite-strings # -finline-functions
MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/gotham/src/comp-tools/winsup/dlmalloc MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/gotham/src/comp-tools/winsup/dlmalloc
MALLOC_OBJ:=#/gotham/src/comp-tools/winsup/dlmalloc/malloc.o MALLOC_OBJ:=#/gotham/src/comp-tools/winsup/dlmalloc/malloc.o
ifeq (,${findstring /,$(srcdir)}) override srcdir:=${shell cd $(srcdir); /bin/pwd}
ifneq (,${filter-out /%,$(srcdir)})
updir:=$(srcdir)/.. updir:=$(srcdir)/..
updir1:=$(updir)/.. updir1:=$(updir)/..
else else
@ -28,7 +29,7 @@ endif
pwd:=${shell pwd} pwd:=${shell pwd}
ifeq (,${findstring /,$(pwd)}) ifneq (,${filter-out /%,$(pwd)})
bupdir:=.. bupdir:=..
bupdir1:=../.. bupdir1:=../..
else else
@ -115,10 +116,10 @@ else
endif endif
$(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c $(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c
@$(MAKE) -C $(@D) $(MAKEOVERRIDES) $(@F) @$(MAKE) -C $(@D) $(@F)
$(w32api_lib)/%.a: $(w32api_lib)/Makefile $(w32api_lib)/%.a: $(w32api_lib)/Makefile
@$(MAKE) --no-print-dir -C $(@D) $(MAKEOVERRIDES) $(@F) @$(MAKE) --no-print-dir -C $(@D) $(@F)
all: all: