aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2003-09-24 15:48:29 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2003-09-24 15:48:29 +0000
commit6376b583e2c318f2d34b71d9b71e314551b108d3 (patch)
tree60163d29957ad70a4b0f9fbeeb423042570a08f5
parentc98c7d9a14a2fae91612a0d4f86a835922b5943b (diff)
downloadbusybox-w32-6376b583e2c318f2d34b71d9b71e314551b108d3.tar.gz
busybox-w32-6376b583e2c318f2d34b71d9b71e314551b108d3.tar.bz2
busybox-w32-6376b583e2c318f2d34b71d9b71e314551b108d3.zip
Use a variable for the config files, makes it easier to syncronise with
debian builds
-rw-r--r--Makefile23
1 files changed, 13 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 819edfb35..d38c2c35b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,9 @@ CFLAGS += -I/usr/include/selinux
36LIBRARIES += -lsecure 36LIBRARIES += -lsecure
37endif 37endif
38 38
39CONFIG_CONFIG_IN = sysdeps/$(TARGET_OS)/Config.in
40CONFIG_DEFCONFIG = sysdeps/$(TARGET_OS)/defconfig
41
39ifeq ($(strip $(HAVE_DOT_CONFIG)),y) 42ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
40 43
41all: busybox busybox.links doc 44all: busybox busybox.links doc
@@ -150,7 +153,7 @@ include/config.h: .config
150 @if [ ! -x ./scripts/config/conf ] ; then \ 153 @if [ ! -x ./scripts/config/conf ] ; then \
151 $(MAKE) -C scripts/config conf; \ 154 $(MAKE) -C scripts/config conf; \
152 fi; 155 fi;
153 @./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in 156 @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
154 157
155%.o: %.c 158%.o: %.c
156 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< 159 $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
@@ -170,34 +173,34 @@ all: menuconfig
170scripts/config/conf: 173scripts/config/conf:
171 $(MAKE) -C scripts/config conf 174 $(MAKE) -C scripts/config conf
172 -@if [ ! -f .config ] ; then \ 175 -@if [ ! -f .config ] ; then \
173 cp sysdeps/$(TARGET_OS)/defconfig .config; \ 176 cp $(CONFIG_DEFCONFIG) .config; \
174 fi 177 fi
175scripts/config/mconf: 178scripts/config/mconf:
176 $(MAKE) -C scripts/config ncurses conf mconf 179 $(MAKE) -C scripts/config ncurses conf mconf
177 -@if [ ! -f .config ] ; then \ 180 -@if [ ! -f .config ] ; then \
178 cp sysdeps/$(TARGET_OS)/defconfig .config; \ 181 cp $(CONFIG_DEFCONFIG) .config; \
179 fi 182 fi
180 183
181menuconfig: scripts/config/mconf 184menuconfig: scripts/config/mconf
182 @./scripts/config/mconf sysdeps/$(TARGET_OS)/Config.in 185 @./scripts/config/mconf $(CONFIG_CONFIG_IN)
183 186
184config: scripts/config/conf 187config: scripts/config/conf
185 @./scripts/config/conf sysdeps/$(TARGET_OS)/Config.in 188 @./scripts/config/conf $(CONFIG_CONFIG_IN)
186 189
187oldconfig: scripts/config/conf 190oldconfig: scripts/config/conf
188 @./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in 191 @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
189 192
190randconfig: scripts/config/conf 193randconfig: scripts/config/conf
191 @./scripts/config/conf -r sysdeps/$(TARGET_OS)/Config.in 194 @./scripts/config/conf -r $(CONFIG_CONFIG_IN)
192 195
193allyesconfig: scripts/config/conf 196allyesconfig: scripts/config/conf
194 @./scripts/config/conf -y sysdeps/$(TARGET_OS)/Config.in 197 @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
195 198
196allnoconfig: scripts/config/conf 199allnoconfig: scripts/config/conf
197 @./scripts/config/conf -n sysdeps/$(TARGET_OS)/Config.in 200 @./scripts/config/conf -n $(CONFIG_CONFIG_IN)
198 201
199defconfig: scripts/config/conf 202defconfig: scripts/config/conf
200 @./scripts/config/conf -d sysdeps/$(TARGET_OS)/Config.in 203 @./scripts/config/conf -d $(CONFIG_CONFIG_IN)
201 204
202test tests: busybox 205test tests: busybox
203 # Note that 'tests' is depricated. Use 'make check' instead 206 # Note that 'tests' is depricated. Use 'make check' instead