diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-24 15:48:29 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-24 15:48:29 +0000 |
commit | 6376b583e2c318f2d34b71d9b71e314551b108d3 (patch) | |
tree | 60163d29957ad70a4b0f9fbeeb423042570a08f5 | |
parent | c98c7d9a14a2fae91612a0d4f86a835922b5943b (diff) | |
download | busybox-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-- | Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -36,6 +36,9 @@ CFLAGS += -I/usr/include/selinux | |||
36 | LIBRARIES += -lsecure | 36 | LIBRARIES += -lsecure |
37 | endif | 37 | endif |
38 | 38 | ||
39 | CONFIG_CONFIG_IN = sysdeps/$(TARGET_OS)/Config.in | ||
40 | CONFIG_DEFCONFIG = sysdeps/$(TARGET_OS)/defconfig | ||
41 | |||
39 | ifeq ($(strip $(HAVE_DOT_CONFIG)),y) | 42 | ifeq ($(strip $(HAVE_DOT_CONFIG)),y) |
40 | 43 | ||
41 | all: busybox busybox.links doc | 44 | all: 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 | |||
170 | scripts/config/conf: | 173 | scripts/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 |
175 | scripts/config/mconf: | 178 | scripts/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 | ||
181 | menuconfig: scripts/config/mconf | 184 | menuconfig: scripts/config/mconf |
182 | @./scripts/config/mconf sysdeps/$(TARGET_OS)/Config.in | 185 | @./scripts/config/mconf $(CONFIG_CONFIG_IN) |
183 | 186 | ||
184 | config: scripts/config/conf | 187 | config: scripts/config/conf |
185 | @./scripts/config/conf sysdeps/$(TARGET_OS)/Config.in | 188 | @./scripts/config/conf $(CONFIG_CONFIG_IN) |
186 | 189 | ||
187 | oldconfig: scripts/config/conf | 190 | oldconfig: scripts/config/conf |
188 | @./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in | 191 | @./scripts/config/conf -o $(CONFIG_CONFIG_IN) |
189 | 192 | ||
190 | randconfig: scripts/config/conf | 193 | randconfig: scripts/config/conf |
191 | @./scripts/config/conf -r sysdeps/$(TARGET_OS)/Config.in | 194 | @./scripts/config/conf -r $(CONFIG_CONFIG_IN) |
192 | 195 | ||
193 | allyesconfig: scripts/config/conf | 196 | allyesconfig: scripts/config/conf |
194 | @./scripts/config/conf -y sysdeps/$(TARGET_OS)/Config.in | 197 | @./scripts/config/conf -y $(CONFIG_CONFIG_IN) |
195 | 198 | ||
196 | allnoconfig: scripts/config/conf | 199 | allnoconfig: scripts/config/conf |
197 | @./scripts/config/conf -n sysdeps/$(TARGET_OS)/Config.in | 200 | @./scripts/config/conf -n $(CONFIG_CONFIG_IN) |
198 | 201 | ||
199 | defconfig: scripts/config/conf | 202 | defconfig: scripts/config/conf |
200 | @./scripts/config/conf -d sysdeps/$(TARGET_OS)/Config.in | 203 | @./scripts/config/conf -d $(CONFIG_CONFIG_IN) |
201 | 204 | ||
202 | test tests: busybox | 205 | test tests: busybox |
203 | # Note that 'tests' is depricated. Use 'make check' instead | 206 | # Note that 'tests' is depricated. Use 'make check' instead |