X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=2b31895e62479b367a3adb2185151b0479f40aa6;hb=51ded05b3bf4df6f126420d39a40d27ea0728aa9;hp=06b42a8e950c6b589c3e18b75f5225b8e2b05533;hpb=da7f095c1203bf58fdb16e8151856e6f850e5820;p=oweals%2Fbusybox.git

diff --git a/Makefile b/Makefile
index 06b42a8e9..2b31895e6 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 #
 
 PROG      := busybox
-VERSION   := 0.51
+VERSION   := 0.53pre
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
@@ -37,8 +37,6 @@ DOSTATIC = false
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
-# eg: `make DODEBUG=true tests'
-# Do not enable this for production builds...
 DODEBUG = false
 
 # Setting this to `true' will cause busybox to directly use the system's
@@ -236,20 +234,20 @@ endif
     
 LIBBB	  = libbb
 LIBBB_LIB = libbb.a
-LIBBB_CSRC= ask_confirmation.c check_wildcard_match.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 \
-full_write.c get_ar_headers.c get_console.c get_last_path_component.c \
-get_line_from_file.c gz_open.c human_readable.c inode_hash.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 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 xreadlink.c\
-xregcomp.c interface.c remove_file.c last_char_is.c
+LIBBB_CSRC= ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
+copy_file_chunk.c daemon.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
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
 LIBBB_CFLAGS = -I$(LIBBB)
 ifneq ($(strip $(BB_SRC_DIR)),)
@@ -259,9 +257,14 @@ 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 can_not_create_raw_socket
 LIBBB_MOBJ=$(patsubst %,$(LIBBB)/%.o, $(LIBBB_MESSAGES))
 
+LIBBB_ARCSRC=libbb/unarchive.c
+LIBBB_ARCOBJ= archive_offset seek_sub_file extract_archive unarchive \
+get_header_ar get_header_cpio get_header_tar deb_extract
+LIBBB_AROBJS=$(patsubst %,$(LIBBB)/%.o, $(LIBBB_ARCOBJ))
+
 
 # Put user-supplied flags at the end, where they
 # have a chance of winning.
@@ -271,10 +274,7 @@ CFLAGS += $(CFLAGS_EXTRA)
 
 all: applet_source_list busybox busybox.links doc
 
-sh.c:
-	@if [ ! -L sh.c ] ; then ln -s lash.c sh.c ; fi
-
-applet_source_list: busybox.sh Config.h sh.c
+applet_source_list: busybox.sh Config.h
 	(echo -n "APPLET_SOURCES := "; BB_SRC_DIR=$(BB_SRC_DIR) $(SHELL) $^) > $@
 
 doc: olddoc
@@ -365,14 +365,20 @@ $(LIBBB_MOBJ): $(LIBBB_MSRC)
 	- mkdir -p $(LIBBB)
 	$(CC) $(CFLAGS) $(LIBBB_CFLAGS) -DL_$(patsubst libbb/%,%,$*) -c $< -o $*.o
 
+$(LIBBB_AROBJS): $(LIBBB_ARCSRC)
+	- mkdir -p $(LIBBB)
+	$(CC) $(CFLAGS) $(LIBBB_CFLAGS) -DL_$(patsubst libbb/%,%,$*) -c $< -o $*.o
+
 libpwd.a: $(PWD_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 
-libbb.a:  $(LIBBB_MOBJ) $(LIBBB_OBJS)
+libbb.a:  $(LIBBB_MOBJ) $(LIBBB_AROBJS) $(LIBBB_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 
 usage.o: usage.h
 
+sh.o: sh.c lash.c hush.c msh.c ash.c
+
 libbb/loop.o: libbb/loop.h
 
 libbb/loop.h: mk_loop_h.sh
@@ -396,7 +402,7 @@ clean:
 	- find -name \*.o -exec rm -f {} \;
 
 distclean: clean
-	- rm -f busybox
+	- rm -f busybox applet_source_list
 	- cd tests && $(MAKE) distclean
 
 install: install.sh busybox busybox.links
@@ -419,11 +425,6 @@ dist release: distclean doc
 				 -print		\
 		-exec rm -rf {} \; ;            \
 						\
-	find busybox-$(VERSION)/ -type f	\
-				 -name .cvsignore \
-				 -print		\
-		-exec rm -f {}  \; ;            \
-						\
 	find busybox-$(VERSION)/ -type f	\
 				 -name .\#*	\
 				 -print		\