diff options
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/Config.in | 28 | ||||
| -rw-r--r-- | debianutils/Kbuild | 13 | ||||
| -rw-r--r-- | debianutils/Makefile | 23 | ||||
| -rw-r--r-- | debianutils/Makefile.in | 33 |
4 files changed, 27 insertions, 70 deletions
diff --git a/debianutils/Config.in b/debianutils/Config.in index 3dd2ef6..3d85999 100644 --- a/debianutils/Config.in +++ b/debianutils/Config.in @@ -5,33 +5,33 @@ menu "Debian Utilities" -config CONFIG_MKTEMP +config MKTEMP bool "mktemp" default n help mktemp is used to create unique temporary files -config CONFIG_PIPE_PROGRESS +config PIPE_PROGRESS bool "pipe_progress" default n help Display a dot to indicate pipe activity. -config CONFIG_READLINK +config READLINK bool "readlink" default n help This program reads a symbolic link and returns the name of the file it points to -config CONFIG_FEATURE_READLINK_FOLLOW +config FEATURE_READLINK_FOLLOW bool "Enable canonicalization by following all symlinks (-f)" default n - depends on CONFIG_READLINK + depends on READLINK help Enable the readlink option (-f). -config CONFIG_RUN_PARTS +config RUN_PARTS bool "run-parts" default n help @@ -46,14 +46,14 @@ config CONFIG_RUN_PARTS Unless you know that run-parts is used in some of your scripts you can safely say N here. -config CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS +config FEATURE_RUN_PARTS_LONG_OPTIONS bool "Enable long options" default n - depends on CONFIG_RUN_PARTS && CONFIG_GETOPT_LONG + depends on RUN_PARTS && GETOPT_LONG help Support long options for the run-parts applet. -config CONFIG_START_STOP_DAEMON +config START_STOP_DAEMON bool "start-stop-daemon" default y help @@ -61,23 +61,23 @@ config CONFIG_START_STOP_DAEMON termination of system-level processes, usually the ones started during the startup of the system. -config CONFIG_FEATURE_START_STOP_DAEMON_FANCY +config FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" default y - depends on CONFIG_START_STOP_DAEMON + depends on START_STOP_DAEMON help Support additional arguments. -o|--oknodo ignored since we exit with 0 anyway -v|--verbose -config CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS +config FEATURE_START_STOP_DAEMON_LONG_OPTIONS bool "Enable long options" default n - depends on CONFIG_START_STOP_DAEMON && CONFIG_GETOPT_LONG + depends on START_STOP_DAEMON && GETOPT_LONG help Support long options for the start-stop-daemon applet. -config CONFIG_WHICH +config WHICH bool "which" default n help diff --git a/debianutils/Kbuild b/debianutils/Kbuild new file mode 100644 index 0000000..99df6a5 --- /dev/null +++ b/debianutils/Kbuild @@ -0,0 +1,13 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> +# +# Licensed under the GPL v2, see the file LICENSE in this tarball. + +lib-y:= +lib-$(CONFIG_MKTEMP) += mktemp.o +lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o +lib-$(CONFIG_READLINK) += readlink.o +lib-$(CONFIG_RUN_PARTS) += run_parts.o +lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o +lib-$(CONFIG_WHICH) += which.o diff --git a/debianutils/Makefile b/debianutils/Makefile deleted file mode 100644 index 3d240b7..0000000 --- a/debianutils/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -ifndef top_srcdir -top_srcdir=.. -endif -ifndef top_builddir -top_builddir=.. -endif -srcdir=$(top_srcdir)/debianutils -DEBIANUTILS_DIR:=./ -include $(top_srcdir)/Rules.mak -include $(top_builddir)/.config -include $(srcdir)/Makefile.in -all: $(libraries-y) --include $(top_builddir)/.depend - -clean: - rm -f *.o *.a $(AR_TARGET) - diff --git a/debianutils/Makefile.in b/debianutils/Makefile.in deleted file mode 100644 index 2983565..0000000 --- a/debianutils/Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -DEBIANUTILS_AR:=debianutils.a -ifndef $(DEBIANUTILS_DIR) -DEBIANUTILS_DIR:=$(top_builddir)/debianutils/ -endif -srcdir=$(top_srcdir)/debianutils - -DEBIANUTILS-y:= -DEBIANUTILS-$(CONFIG_MKTEMP) += mktemp.o -DEBIANUTILS-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o -DEBIANUTILS-$(CONFIG_READLINK) += readlink.o -DEBIANUTILS-$(CONFIG_RUN_PARTS) += run_parts.o -DEBIANUTILS-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o -DEBIANUTILS-$(CONFIG_WHICH) += which.o - -ifneq ($(strip $(DEBIANUTILS-y)),) -libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR) -endif -DEBIANUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(DEBIANUTILS-y)) -DEBIANUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) -APPLET_SRC-y+=$(DEBIANUTILS_SRC-y) -APPLET_SRC-a+=$(DEBIANUTILS_SRC-a) - -$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR): $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y)) - $(do_ar) - -$(DEBIANUTILS_DIR)%.o: $(srcdir)/%.c - $(compile.c) |