#
PROG := busybox
-VERSION := 0.50
-BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
+VERSION := 0.53pre
+BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
export VERSION
# With a modern GNU make(1) (highly recommended, that's what all the
# 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
# 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/ )
# Do not enable this for production builds...
DODMALLOC = false
+# Electric-fence is another very useful malloc debugging library.
+# Do not enable this for production builds...
+DOEFENCE = false
+
# If you want large file summit support, turn this on.
# This has no effect if you don't have a kernel with lfs
# support, and a system with libc-2.1.3 or later.
# To compile vs uClibc, just use the compiler wrapper built by uClibc...
# This make things very easy? Everything should compile and work as
# expected these days...
-#CC = ../uClibc/extra/gcc-uClibc/gcc-uClibc-i386
+#CC = ../uClibc/extra/gcc-uClibc/i386-uclibc-gcc
# To compile vs some other alternative libc, you may need to use/adjust
# the following lines to meet your needs...
OPTIMIZATION := $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
then echo "-Os"; else echo "-O2" ; fi)
-WARNINGS = -Wall
+WARNINGS = -Wall -Wshadow
+
+ARFLAGS = -r
#
#--------------------------------------------------------
LIBRARIES = -ldmalloc
# Force debug=true, since this is useless when not debugging...
DODEBUG = true
+else
+ ifeq ($(strip $(DOEFENCE)),true)
+ LIBRARIES = -lefence
+ # Force debug=true, since this is useless when not debugging...
+ DODEBUG = true
+ endif
endif
ifeq ($(strip $(DODEBUG)),true)
CFLAGS += $(WARNINGS) -g -D_GNU_SOURCE
# And option 4:
-include applet_source_list
-OBJECTS = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o utility.o
+OBJECTS = $(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
CFLAGS += $(CROSS_CFLAGS)
CFLAGS += -DBB_VER='"$(VERSION)"'
CFLAGS += -DBB_BT='"$(BUILDTIME)"'
else
CFLAGS += -DUSE_SYSTEM_PWD_GRP
endif
+
+LIBBB = libbb
+LIBBB_LIB = libbb.a
+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)),)
+ LIBBB_CFLAGS += -I$(BB_SRC_DIR)/$(LIBBB)
+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 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.
all: applet_source_list busybox busybox.links doc
applet_source_list: busybox.sh Config.h
- (echo -n "APPLET_SOURCES := "; $(SHELL) $^ $(BB_SRC_DIR)) > $@
+ (echo -n "APPLET_SOURCES := "; BB_SRC_DIR=$(BB_SRC_DIR) $(SHELL) $^) > $@
doc: olddoc
# Old Docs...
-olddoc: docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+olddoc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+
+docs/busybox.pod : docs/busybox_header.pod usage.h docs/busybox_footer.pod
+ - ( cat docs/busybox_header.pod; \
+ docs/autodocifier.pl usage.h; \
+ cat docs/busybox_footer.pod ) > docs/busybox.pod
docs/BusyBox.txt: docs/busybox.pod
@echo
-@ mkdir -p docs/busybox.lineo.com
- pod2html --noindex $< > \
docs/busybox.lineo.com/BusyBox.html
- -@ rm -f pod2html*
+ -@ rm -f pod2htm*
# New docs based on DOCBOOK SGML
(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
-busybox: $(PWD_LIB) $(OBJECTS)
- $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB)
+busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBBB_LIB) $(PWD_LIB) $(LIBRARIES)
$(STRIP)
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
- mkdir -p $(PWD_GRP)
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
+$(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile libbb/libbb.h
+ - mkdir -p $(LIBBB)
+ $(CC) $(CFLAGS) $(LIBBB_CFLAGS) -c $< -o $*.o
+
+$(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_AROBJS) $(LIBBB_OBJS)
+ $(AR) $(ARFLAGS) $@ $^
+
usage.o: usage.h
-utility.o: loop.h
+sh.o: sh.c lash.c hush.c msh.c ash.c
+
+libbb/loop.o: libbb/loop.h
-loop.h: mk_loop_h.sh
+libbb/loop.h: mk_loop_h.sh
@ $(SHELL) $< > $@
test tests:
- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
docs/busybox.pdf docs/busybox.lineo.com/busybox.html
- rm -f multibuild.log Config.h.orig
- - rm -rf docs/busybox _install libpwd.a
- - rm -f busybox.links loop.h *~ slist.mk core applet_source_list
+ - rm -rf docs/busybox _install libpwd.a libbb.a pod2htm*
+ - rm -f busybox.links libbb/loop.h *~ slist.mk core applet_source_list
- 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
find busybox-$(VERSION)/ -type d \
-name CVS \
-print \
- -exec rm -rf {} \; \
- \
- find busybox-$(VERSION)/ -type f \
- -name .cvsignore \
- -print \
- -exec rm -f {} \; \
+ -exec rm -rf {} \; ; \
\
find busybox-$(VERSION)/ -type f \
-name .\#* \
-print \
- -exec rm -f {} \; \
+ -exec rm -f {} \; ; \
\
tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
projects / oweals / busybox.git / blobdiff