Updates from both Vladimir and Larry

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 76e50227e2af7602714969090f23e2a7408559fc..866fe5b46625e66cff9327c78aa5ec08373e8c84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 #
 
 PROG      := busybox
-VERSION   := 0.51
+VERSION   := 0.52pre
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
@@ -45,11 +45,12 @@ DODEBUG = false
 # password and group functions.  Assuming you use GNU libc, when this is
 # `true', you will need to install the /etc/nsswitch.conf configuration file
 # and the required libnss_* libraries. This generally makes your embedded
-# system quite a bit larger... If you leave this off, busybox will directly
-# use the /etc/password, /etc/group files (and your system will be smaller, and
-# I will get fewer emails asking about how glibc NSS works).  Enabling this adds
-# just 1.4k to the binary size (which is a _lot_ less then glibc NSS costs),
-# Most people will want to leave this set to false.
+# system quite a bit larger... If you leave this off, busybox will directly use
+# the /etc/password, /etc/group files (and your system will be smaller, and I
+# will get fewer emails asking about how glibc NSS works).  Enabling this adds
+# just 1.4k to the binary size (which is a _lot_ less then glibc NSS costs).
+# Note that if you want hostname resolution to work with glibc, you still need
+# the libnss_* libraries.  Most people will want to leave this set to false.
 USE_SYSTEM_PWD_GRP = true
 
 # This enables compiling with dmalloc ( http://dmalloc.com/ )
@@ -235,7 +236,7 @@ endif
     
 LIBBB    = libbb
 LIBBB_LIB = libbb.a
-LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c \
+LIBBB_CSRC= ask_confirmation.c chomp.c \
 concat_path_file.c copy_file.c copy_file_chunk.c create_path.c \
 daemon.c deb_extract.c device_open.c error_msg.c error_msg_and_die.c \
 find_mount_point.c find_pid_by_name.c find_root_device.c full_read.c \
@@ -247,8 +248,9 @@ 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 read_text_file_to_buffer.c \
 recursive_action.c safe_read.c safe_strncpy.c seek_ared_file.c syscalls.c \
 syslog_msg_with_name.c time_string.c trim.c untar.c unzip.c vdprintf.c \
-verror_msg.c vperror_msg.c wfopen.c xfuncs.c xgetcwd.c xregcomp.c interface.c \
-remove_file.c last_char_is.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
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
 LIBBB_CFLAGS = -I$(LIBBB)
 ifneq ($(strip $(BB_SRC_DIR)),)
@@ -258,7 +260,7 @@ endif
 LIBBB_MSRC=libbb/messages.c
 LIBBB_MESSAGES= 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
+write_error too_few_args name_longer_than_foo unknown
 LIBBB_MOBJ=$(patsubst %,$(LIBBB)/%.o, $(LIBBB_MESSAGES))
 
 
@@ -270,11 +272,11 @@ CFLAGS += $(CFLAGS_EXTRA)
 
 all: applet_source_list busybox busybox.links doc
 
-sh_link:
+sh.c:
        @if [ ! -L sh.c ] ; then ln -s lash.c sh.c ; fi
 
-applet_source_list: sh_link busybox.sh Config.h
-       (echo -n "APPLET_SOURCES := "; $(SHELL) $(filter-out sh_link, $^) $(BB_SRC_DIR)) > $@
+applet_source_list: busybox.sh Config.h sh.c
+       (echo -n "APPLET_SOURCES := "; BB_SRC_DIR=$(BB_SRC_DIR) $(SHELL) $^) > $@
 
 doc: olddoc
 
@@ -430,6 +432,6 @@ dist release: distclean doc
                                                \
        tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
 
-.PHONY: tags sh_link
+.PHONY: tags
 tags:
        ctags -R .