2 files changed, 74 insertions, 48 deletions

diff --git a/libbb/Makefile b/libbb/Makefile
index 879be2452..f6d021ce9 100644
--- a/libbb/Makefile
+++ b/libbb/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 2001 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
@@ -15,53 +15,16 @@
 # 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
+#
 
-
-
-TOPDIR   :=..
-L_TARGET := libbb.a
-
-LIBBB_MSRC=messages.c
-LIBBB_OBJ= full_version name_too_long omitting_directory not_a_directory \
-        memory_exhausted invalid_date invalid_option io_error dash_dash_help \
-        write_error too_few_args name_longer_than_foo unknown can_not_create_raw_socket
-LIBBB_MOBJS=$(patsubst %,%.o, $(LIBBB_OBJ))
-
-obj-y           :=
-obj-n           :=
-obj-            :=
-
-obj-y += ask_confirmation.o chomp.o concat_path_file.o copy_file.o \
-        copy_file_chunk.o dump.o libc5.o device_open.o error_msg.o \
-        error_msg_and_die.o fgets_str.o find_mount_point.o find_pid_by_name.o \
-        find_root_device.o full_read.o full_write.o get_console.o \
-        get_last_path_component.o get_line_from_file.o gz_open.o human_readable.o \
-        isdirectory.o kernel_version.o loop.o mode_string.o module_syscalls.o mtab.o \
-        mtab_file.o my_getgrnam.o my_getgrgid.o my_getpwnam.o my_getpwnamegid.o \
-        my_getpwuid.o parse_mode.o parse_number.o perror_msg.o perror_msg_and_die.o \
-        print_file.o process_escape_sequence.o read_package_field.o recursive_action.o \
-        safe_read.o safe_strncpy.o syscalls.o syslog_msg_with_name.o time_string.o \
-        trim.o unzip.o vdprintf.o verror_msg.o vperror_msg.o wfopen.o xfuncs.o \
-        xgetcwd.o xreadlink.o xregcomp.o interface.o remove_file.o last_char_is.o \
-        copyfd.o vherror_msg.o herror_msg.o herror_msg_and_die.o xgethostbyname.o \
-        dirname.o make_directory.o create_icmp_socket.o u_signal_names.o arith.o \
-        simplify_path.o inet_common.o inode_hash.o $(LIBBB_MOBJS) $(LIBBB_AROBJS)
-
-
-# Hand off to toplevel Rules.mak
-include $(TOPDIR)/Rules.mak
-
-$(LIBBB_MOBJS): $(LIBBB_MSRC)
-        $(CC) $(CFLAGS) -DBB_VER='"$(VERSION)"' -DBB_BT='"$(BUILDTIME)"' \
-                $(LIBBB_CFLAGS) -DL_$(patsubst %,%,$*) -c $< -o $*.o
-
-$(LIBBB_AROBJS): $(LIBBB_ARCSRC)
-        $(CC) $(CFLAGS) $(LIBBB_CFLAGS) -DL_$(patsubst %,%,$*) -c $< -o $*.o
-
-loop.o: loop.h
-
-loop.h: mk_loop_h.sh
-        @ $(SHELL) $< > $@
+TOPDIR:= ../
+LIBBB_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/libbb/Makefile.in b/libbb/Makefile.in
new file mode 100644
index 000000000..6d098c0e5
--- /dev/null
+++ b/libbb/Makefile.in
@@ -0,0 +1,63 @@
+# Makefile for busybox
+#
+# 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
+# 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
+
+
+
+LIBBB_AR:=libbb.a
+ifndef $(LIBBB_DIR)
+LIBBB_DIR:=$(TOPDIR)libbb/
+endif
+
+LIBBB_SRC:= \
+        ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
+        copy_file_chunk.c dump.c libc5.c device_open.c error_msg.c \
+        error_msg_and_die.c fgets_str.c find_mount_point.c find_pid_by_name.c \
+        find_root_device.c full_read.c full_write.c get_console.c \
+        get_last_path_component.c get_line_from_file.c gz_open.c human_readable.c \
+        isdirectory.c kernel_version.c loop.c mode_string.c module_syscalls.c mtab.c \
+        mtab_file.c my_getgrnam.c my_getgrgid.c my_getpwnam.c my_getpwnamegid.c \
+        my_getpwuid.c parse_mode.c parse_number.c perror_msg.c perror_msg_and_die.c \
+        print_file.c process_escape_sequence.c read_package_field.c recursive_action.c \
+        safe_read.c safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \
+        trim.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \
+        xgetcwd.c xreadlink.c xregcomp.c interface.c remove_file.c last_char_is.c \
+        copyfd.c vherror_msg.c herror_msg.c herror_msg_and_die.c xgethostbyname.c \
+        dirname.c make_directory.c create_icmp_socket.c u_signal_names.c arith.c \
+        simplify_path.c inet_common.c inode_hash.c
+LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC))
+
+LIBBB_MSRC:=$(LIBBB_DIR)messages.c
+LIBBB_MOBJ:=full_version.o name_too_long.o omitting_directory.o not_a_directory.o \
+        memory_exhausted.o invalid_date.o invalid_option.o io_error.o dash_dash_help.o \
+        write_error.o too_few_args.o name_longer_than_foo.o unknown.o can_not_create_raw_socket.o
+LIBBB_MOBJS=$(patsubst %,$(LIBBB_DIR)%, $(LIBBB_MOBJ))
+
+libraries-y+=$(LIBBB_DIR)$(LIBBB_AR)
+
+$(LIBBB_DIR)$(LIBBB_AR): $(LIBBB_OBJS) $(LIBBB_MOBJS) 
+        $(AR) -ro $@ $(LIBBB_OBJS) $(LIBBB_MOBJS)
+
+$(LIBBB_MOBJS): $(LIBBB_MSRC)
+        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DL_$(notdir $*) -c $< -o $@
+
+$(LIBBB_DIR)loop.o: $(LIBBB_DIR)loop.h
+
+$(LIBBB_DIR)loop.h: $(LIBBB_DIR)mk_loop_h.sh
+        @ $(SHELL) $< > $@
+
+