aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2005-09-26 16:01:43 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2005-09-26 16:01:43 +0000
commit1c943eb88af4782f02001ced33f0b07e892bdb22 (patch)
tree82cf8538328a28f31eea2fd5a8d5bf06ecd9e6f9
parentd24eaac9e66d1f725a7b3c8e8d472845c3f63c39 (diff)
downloadbusybox-w32-1c943eb88af4782f02001ced33f0b07e892bdb22.tar.gz
busybox-w32-1c943eb88af4782f02001ced33f0b07e892bdb22.tar.bz2
busybox-w32-1c943eb88af4782f02001ced33f0b07e892bdb22.zip
- remove unused variable TOPDIR
-rw-r--r--Makefile6
-rw-r--r--Rules.mak2
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c3b54ad2f..a88062e54 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,11 @@ noconfig_targets := menuconfig config oldconfig randconfig \
12 defconfig allyesconfig allnoconfig clean distclean \ 12 defconfig allyesconfig allnoconfig clean distclean \
13 release tags 13 release tags
14 14
15ifndef TOPDIR 15# the toplevel sourcedir
16TOPDIR=$(CURDIR)/
17endif
18ifndef top_srcdir 16ifndef top_srcdir
19top_srcdir=$(CURDIR) 17top_srcdir=$(CURDIR)
20endif 18endif
19# toplevel directory of the object-tree
21ifndef top_builddir 20ifndef top_builddir
22top_builddir=$(CURDIR) 21top_builddir=$(CURDIR)
23endif 22endif
@@ -70,7 +69,6 @@ $(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUT
70 $(MAKE) -C $(KBUILD_OUTPUT) \ 69 $(MAKE) -C $(KBUILD_OUTPUT) \
71 top_srcdir=$(CURDIR) \ 70 top_srcdir=$(CURDIR) \
72 top_builddir=$(KBUILD_OUTPUT) \ 71 top_builddir=$(KBUILD_OUTPUT) \
73 TOPDIR=$(KBUILD_OUTPUT) \
74 KBUILD_SRC=$(CURDIR) \ 72 KBUILD_SRC=$(CURDIR) \
75 -f $(CURDIR)/Makefile $@ 73 -f $(CURDIR)/Makefile $@
76 74
diff --git a/Rules.mak b/Rules.mak
index e186af00d..b18d09b96 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -84,7 +84,7 @@ CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
84ARFLAGS=cru 84ARFLAGS=cru
85 85
86#-------------------------------------------------------- 86#--------------------------------------------------------
87export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP 87export VERSION BUILDTIME HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
88ifeq ($(strip $(TARGET_ARCH)),) 88ifeq ($(strip $(TARGET_ARCH)),)
89TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ 89TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
90 -e 's/i.86/i386/' \ 90 -e 's/i.86/i386/' \