From 7d219aab70e6951ab82c27c202cac05016696723 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Thu, 5 Oct 2006 10:17:08 +0000
Subject: build system overhaul

---
 applets/Kbuild      |  9 +++++++++
 applets/Makefile    | 23 -----------------------
 applets/Makefile.in | 26 --------------------------
 applets/applets.c   |  2 --
 4 files changed, 9 insertions(+), 51 deletions(-)
 create mode 100644 applets/Kbuild
 delete mode 100644 applets/Makefile
 delete mode 100644 applets/Makefile.in

(limited to 'applets')

diff --git a/applets/Kbuild b/applets/Kbuild
new file mode 100644
index 0000000..04932ee
--- /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 0d892f5..0000000
--- 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 05580b9..0000000
--- 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 d615ffc..b1f5809 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"
 
-- 
cgit v1.1