mirror of
https://github.com/sheumann/hush.git
synced 2024-12-25 03:32:18 +00:00
Use a variable for the config files, makes it easier to syncronise with
debian builds
This commit is contained in:
parent
c98c7d9a14
commit
6376b583e2
23
Makefile
23
Makefile
@ -36,6 +36,9 @@ CFLAGS += -I/usr/include/selinux
|
|||||||
LIBRARIES += -lsecure
|
LIBRARIES += -lsecure
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
CONFIG_CONFIG_IN = sysdeps/$(TARGET_OS)/Config.in
|
||||||
|
CONFIG_DEFCONFIG = sysdeps/$(TARGET_OS)/defconfig
|
||||||
|
|
||||||
ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
|
ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
|
||||||
|
|
||||||
all: busybox busybox.links doc
|
all: busybox busybox.links doc
|
||||||
@ -150,7 +153,7 @@ include/config.h: .config
|
|||||||
@if [ ! -x ./scripts/config/conf ] ; then \
|
@if [ ! -x ./scripts/config/conf ] ; then \
|
||||||
$(MAKE) -C scripts/config conf; \
|
$(MAKE) -C scripts/config conf; \
|
||||||
fi;
|
fi;
|
||||||
@./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf -o $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
|
||||||
@ -170,34 +173,34 @@ all: menuconfig
|
|||||||
scripts/config/conf:
|
scripts/config/conf:
|
||||||
$(MAKE) -C scripts/config conf
|
$(MAKE) -C scripts/config conf
|
||||||
-@if [ ! -f .config ] ; then \
|
-@if [ ! -f .config ] ; then \
|
||||||
cp sysdeps/$(TARGET_OS)/defconfig .config; \
|
cp $(CONFIG_DEFCONFIG) .config; \
|
||||||
fi
|
fi
|
||||||
scripts/config/mconf:
|
scripts/config/mconf:
|
||||||
$(MAKE) -C scripts/config ncurses conf mconf
|
$(MAKE) -C scripts/config ncurses conf mconf
|
||||||
-@if [ ! -f .config ] ; then \
|
-@if [ ! -f .config ] ; then \
|
||||||
cp sysdeps/$(TARGET_OS)/defconfig .config; \
|
cp $(CONFIG_DEFCONFIG) .config; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
menuconfig: scripts/config/mconf
|
menuconfig: scripts/config/mconf
|
||||||
@./scripts/config/mconf sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/mconf $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
config: scripts/config/conf
|
config: scripts/config/conf
|
||||||
@./scripts/config/conf sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
oldconfig: scripts/config/conf
|
oldconfig: scripts/config/conf
|
||||||
@./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf -o $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
randconfig: scripts/config/conf
|
randconfig: scripts/config/conf
|
||||||
@./scripts/config/conf -r sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf -r $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
allyesconfig: scripts/config/conf
|
allyesconfig: scripts/config/conf
|
||||||
@./scripts/config/conf -y sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
allnoconfig: scripts/config/conf
|
allnoconfig: scripts/config/conf
|
||||||
@./scripts/config/conf -n sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf -n $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
defconfig: scripts/config/conf
|
defconfig: scripts/config/conf
|
||||||
@./scripts/config/conf -d sysdeps/$(TARGET_OS)/Config.in
|
@./scripts/config/conf -d $(CONFIG_CONFIG_IN)
|
||||||
|
|
||||||
test tests: busybox
|
test tests: busybox
|
||||||
# Note that 'tests' is depricated. Use 'make check' instead
|
# Note that 'tests' is depricated. Use 'make check' instead
|
||||||
|
Loading…
Reference in New Issue
Block a user