#
PROG := busybox
-VERSION := 0.50pre
+VERSION := 0.51pre
BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
export VERSION
# 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.
-USE_SYSTEM_PWD_GRP = false
+USE_SYSTEM_PWD_GRP = true
# This enables compiling with dmalloc ( http://dmalloc.com/ )
# which is an excellent public domain mem leak and malloc problem
# 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.
STRIPTOOL = $(CROSS)strip
# To compile vs uClibc, just use the compiler wrapper built by uClibc...
-# Isn't that easy? Right now, uClibc needs BB_FEATURE_NFSMOUNT disabled
-# since uClibc's nfs support isn't ready yet.
+# This make things very easy? Everything should compile and work as
+# expected these days...
#CC = ../uClibc/extra/gcc-uClibc/gcc-uClibc-i386
# To compile vs some other alternative libc, you may need to use/adjust
# the following lines to meet your needs...
-#LIBCDIR=/usr/i486-linuxlibc1/
+#
+# If you are using Red Hat 6.x with the compatible RPMs (for developing under
+# Red Hat 5.x and glibc 2.0) uncomment the following. Be sure to read about
+# using the compatible RPMs (compat-*) at http://www.redhat.com !
+#LIBCDIR=/usr/i386-glibc20-linux
+#
+# The following is used for libc5 (if you install altgcc and libc5-altdev
+# on a Debian system).
+#LIBCDIR=/usr/i486-linuxlibc1
+#
+# For other libraries, you are on your own...
#LDFLAGS+=-nostdlib
-#LIBRARIES = $(LIBCDIR)/libc.a -lgcc
+#LIBRARIES = $(LIBCDIR)/lib/libc.a -lgcc
#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
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 messages.o usage.o applets.o
CFLAGS += $(CROSS_CFLAGS)
CFLAGS += -DBB_VER='"$(VERSION)"'
CFLAGS += -DBB_BT='"$(BUILDTIME)"'
ifneq ($(strip $(USE_SYSTEM_PWD_GRP)),true)
PWD_GRP = pwd_grp
- PWD_GRP_DIR = $(BB_SRC_DIR)$(PWD_GRP)
+ PWD_GRP_DIR = $(BB_SRC_DIR:=/)$(PWD_GRP)
PWD_LIB = libpwd.a
- LIBRARIES += $(PWD_LIB)
PWD_CSRC=__getpwent.c pwent.c getpwnam.c getpwuid.c putpwent.c getpw.c \
fgetpwent.c __getgrent.c grent.c getgrnam.c getgrgid.c fgetgrent.c \
initgroups.c setgroups.c
else
CFLAGS += -DUSE_SYSTEM_PWD_GRP
endif
+
+LIBBB = libbb
+LIBBB_LIB = libbb.a
+LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c copy_file.c \
+copy_file_chunk.c create_path.c daemon.c device_open.c error_msg.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 \
+human_readable.c inode_hash.c isdirectory.c kernel_version.c loop.c \
+mode_string.c parse_mode.c parse_number.c print_file.c process_escape_sequence.c \
+my_getgrgid.c my_getpwnamegid.c my_getpwuid.c my_getgrnam.c my_getpwnam.c \
+recursive_action.c safe_read.c safe_strncpy.c syscalls.c module_syscalls.c \
+syslog_msg_with_name.c time_string.c trim.c vdprintf.c wfopen.c xfuncs.c \
+xregcomp.c error_msg_and_die.c perror_msg.c perror_msg_and_die.c \
+verror_msg.c vperror_msg.c mtab.c mtab_file.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
+
# Put user-supplied flags at the end, where they
# have a chance of winning.
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
$< > $@
docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
+ - mkdir -p docs
-@ rm -f docs/BusyBox.html
-@ ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
-busybox: $(PWD_LIB) $(OBJECTS)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
+busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(PWD_LIB) $(LIBBB_LIB) $(LIBRARIES)
$(STRIP)
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
- $(SHELL) $^ >$@
nfsmount.o cmdedit.o: %.o: %.h
+sh.o: cmdedit.h
$(OBJECTS): %.o: %.c Config.h busybox.h applets.h Makefile
- $(CC) $(CFLAGS) -I- -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o
+ $(CC) -I- $(CFLAGS) -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o
-$(PWD_OBJS): %.o: %.c pwd_lib_objdir Config.h busybox.h applets.h Makefile
+$(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
+ - mkdir -p $(PWD_GRP)
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
-$(PWD_LIB): $(PWD_OBJS)
- $(AR) $(ARFLAGS) $(PWD_LIB) $^
+$(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile libbb/libbb.h
+ - mkdir -p $(LIBBB)
+ $(CC) $(CFLAGS) $(LIBBB_CFLAGS) -c $< -o $*.o
+
+libpwd.a: $(PWD_OBJS)
+ $(AR) $(ARFLAGS) $@ $^
-pwd_lib_objdir:
- mkdir -p $(PWD_GRP)
+libbb.a: $(LIBBB_OBJS)
+ $(AR) $(ARFLAGS) $@ $^
usage.o: usage.h
-utility.o: loop.h
+libbb/loop.o: libbb/loop.h
-loop.h: mk_loop_h.sh
+libbb/loop.h: mk_loop_h.sh
@ $(SHELL) $< > $@
test tests:
- cd tests && $(MAKE) all
+ # old way of doing it
+ #cd tests && $(MAKE) all
+ # new way of doing it
+ cd tests && ./tester.sh
clean:
- cd tests && $(MAKE) clean
- 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 $(PWD_LIB)
- - rm -f busybox.links loop.h *~ slist.mk core applet_source_list
- - find -name *.o | xargs rm -f;
+ - rm -rf docs/busybox _install libpwd.a libbb.a
+ - rm -f busybox.links libbb/loop.h *~ slist.mk core applet_source_list
+ - find -name \*.o -exec rm -f {} \;
distclean: clean
- rm -f busybox
find busybox-$(VERSION)/ -type d \
-name CVS \
-print \
- | xargs rm -rf; \
+ -exec rm -rf {} \; ; \
\
find busybox-$(VERSION)/ -type f \
-name .cvsignore \
-print \
- | xargs rm -f; \
+ -exec rm -f {} \; ; \
\
find busybox-$(VERSION)/ -type f \
-name .\#* \
-print \
- | xargs rm -f; \
+ -exec rm -f {} \; ; \
\
tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
projects / oweals / busybox.git / blobdiff