aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2001-10-25 14:59:48 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2001-10-25 14:59:48 +0000
commit9f2f8540c5f48323a9a4085c8b9dbba63ec5a760 (patch)
treec59d4a1e76195ec7e037a30bcfdcf9ea5abae8a7
parente9fc78157043a07adae6ed39939e269b6b3524d0 (diff)
downloadbusybox-w32-9f2f8540c5f48323a9a4085c8b9dbba63ec5a760.tar.gz
busybox-w32-9f2f8540c5f48323a9a4085c8b9dbba63ec5a760.tar.bz2
busybox-w32-9f2f8540c5f48323a9a4085c8b9dbba63ec5a760.zip
rEcover from my previous commit
-rw-r--r--libbb/Makefile8
-rw-r--r--networking/config.in1
2 files changed, 1 insertions, 8 deletions
diff --git a/libbb/Makefile b/libbb/Makefile
index 0aeaaf79d..85ce95c90 100644
--- a/libbb/Makefile
+++ b/libbb/Makefile
@@ -27,18 +27,12 @@ LIBBB_OBJ= full_version name_too_long omitting_directory not_a_directory \
27 write_error too_few_args name_longer_than_foo unknown can_not_create_raw_socket 27 write_error too_few_args name_longer_than_foo unknown can_not_create_raw_socket
28LIBBB_MOBJS=$(patsubst %,%.o, $(LIBBB_OBJ)) 28LIBBB_MOBJS=$(patsubst %,%.o, $(LIBBB_OBJ))
29 29
30LIBBB_ARCSRC=unarchive.c
31LIBBB_ARCOBJ= archive_offset seek_sub_file extract_archive unarchive \
32 get_header_ar get_header_cpio get_header_tar deb_extract
33LIBBB_AROBJS=$(patsubst %,%.o, $(LIBBB_ARCOBJ))
34
35
36obj-y := 30obj-y :=
37obj-n := 31obj-n :=
38obj- := 32obj- :=
39 33
40obj-y += ask_confirmation.o chomp.o concat_path_file.o copy_file.o \ 34obj-y += ask_confirmation.o chomp.o concat_path_file.o copy_file.o \
41 copy_file_chunk.o deb_functs.o libc5.o device_open.o error_msg.o \ 35 copy_file_chunk.o libc5.o device_open.o error_msg.o \
42 error_msg_and_die.o fgets_str.o find_mount_point.o find_pid_by_name.o \ 36 error_msg_and_die.o fgets_str.o find_mount_point.o find_pid_by_name.o \
43 find_root_device.o full_read.o full_write.o get_console.o \ 37 find_root_device.o full_read.o full_write.o get_console.o \
44 get_last_path_component.o get_line_from_file.o gz_open.o human_readable.o \ 38 get_last_path_component.o get_line_from_file.o gz_open.o human_readable.o \
diff --git a/networking/config.in b/networking/config.in
index 95cda42d8..577d925c3 100644
--- a/networking/config.in
+++ b/networking/config.in
@@ -6,7 +6,6 @@
6mainmenu_option next_comment 6mainmenu_option next_comment
7comment 'Networking Utilities' 7comment 'Networking Utilities'
8 8
9bool 'apt_get' CONFIG_APT_GET
10bool 'hostname' CONFIG_HOSTNAME 9bool 'hostname' CONFIG_HOSTNAME
11bool 'ifconfig' CONFIG_IFCONFIG 10bool 'ifconfig' CONFIG_IFCONFIG
12bool 'nc' CONFIG_NC 11bool 'nc' CONFIG_NC