aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile28
-rw-r--r--shell/Makefile.in36
2 files changed, 45 insertions, 19 deletions
diff --git a/shell/Makefile b/shell/Makefile
index e0229973e..f3b1042e6 100644
--- a/shell/Makefile
+++ b/shell/Makefile
@@ -1,6 +1,6 @@
# Makefile for busybox
#
-# Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,24 +17,14 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-TOPDIR :=..
-L_TARGET := shell.a
-EXTRA_CFLAGS = -DBB_VER='"$(VERSION)"' -DBB_BT='"$(BUILDTIME)"'
-
-obj-y :=
-obj-n :=
-obj- :=
-
-obj-$(CONFIG_ASH) += ash.o
-obj-$(CONFIG_HUSH) += hush.o
-obj-$(CONFIG_LASH) += lash.o
-obj-$(CONFIG_MSH) += msh.o
-obj-$(CONFIG_FEATURE_COMMAND_EDITING) += cmdedit.o
-
-
-# Hand off to toplevel Rules.mak
-include $(TOPDIR)/Rules.mak
+TOPDIR:= ../
+SHELL_DIR:=./
+include $(TOPDIR).config
+include $(TOPDIR)Rules.mak
+include Makefile.in
+all: $(libraries-y)
+-include $(TOPDIR).depend
clean:
- rm -f $(L_TARGET) *.o core
+ rm -f *.o *.a $(AR_TARGET)
diff --git a/shell/Makefile.in b/shell/Makefile.in
new file mode 100644
index 000000000..a5778d6fd
--- /dev/null
+++ b/shell/Makefile.in
@@ -0,0 +1,36 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+SHELL_AR:=shell.a
+ifndef $(SHELL_DIR)
+SHELL_DIR:=$(TOPDIR)shell/
+endif
+
+SHELLT-y:=
+SHELLT-$(CONFIG_ASH) += ash.o
+SHELLT-$(CONFIG_HUSH) += hush.o
+SHELLT-$(CONFIG_LASH) += lash.o
+SHELLT-$(CONFIG_MSH) += msh.o
+SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING) += cmdedit.o
+
+libraries-y+=$(SHELL_DIR)$(SHELL_AR)
+
+$(SHELL_DIR)$(SHELL_AR): $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
+ $(AR) -ro $@ $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
+