diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-05 10:17:08 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-05 10:17:08 +0000 |
| commit | 7d219aab70e6951ab82c27c202cac05016696723 (patch) | |
| tree | 4c0679bfa391f71aee9b51505a5d3dc8f60a0cf7 /applets | |
| parent | 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (diff) | |
build system overhaul
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/Kbuild | 9 | ||||
| -rw-r--r-- | applets/Makefile | 23 | ||||
| -rw-r--r-- | applets/Makefile.in | 26 | ||||
| -rw-r--r-- | applets/applets.c | 2 |
4 files changed, 9 insertions, 51 deletions
diff --git a/applets/Kbuild b/applets/Kbuild new file mode 100644 index 000000000..04932eec4 --- /dev/null +++ b/applets/Kbuild @@ -0,0 +1,9 @@ +# 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. + +obj-y:= +obj-y += applets.o +obj-y += busybox.o diff --git a/applets/Makefile b/applets/Makefile deleted file mode 100644 index 0d892f5e5..000000000 --- a/applets/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)/applets -APPLETS_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/applets/Makefile.in b/applets/Makefile.in deleted file mode 100644 index 05580b9b4..000000000 --- a/applets/Makefile.in +++ /dev/null @@ -1,26 +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. - -APPLETS_AR:=applets.a -ifndef $(APPLETS_DIR) -APPLETS_DIR:=$(top_builddir)/applets/ -endif -srcdir=$(top_srcdir)/applets - -APPLET_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c) -APPLET_OBJ:= $(patsubst $(srcdir)/%.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) - -APPLET_SRC-y+=$(APPLET_SRC) -APPLET_SRC-a+=$(APPLET_SRC) - -libraries-y+=$(APPLETS_DIR)$(APPLETS_AR) - -$(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ) - $(do_ar) - -$(APPLET_OBJ): $(top_builddir)/.config -$(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c - $(compile.c) diff --git a/applets/applets.c b/applets/applets.c index d615ffcd8..b1f580953 100644 --- a/applets/applets.c +++ b/applets/applets.c @@ -42,8 +42,6 @@ const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1); #ifdef CONFIG_FEATURE_SUID_CONFIG #include <ctype.h> -#include "pwd_.h" -#include "grp_.h" #define CONFIG_FILE "/etc/busybox.conf" |