X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=2a796596e73b818c0df43586b9a9c3677a92574d;hb=7cf9fed83f6e7bf86eb4cac324b98734739fa861;hp=4ff1078d691a7f8ac5a8820e302e513f1f27e5e5;hpb=1ca20a77476fb69e2472080ef6ba23c8c0ad12ad;p=oweals%2Fbusybox.git

diff --git a/Makefile b/Makefile
index 4ff1078d6..2a796596e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 #
 
 PROG      := busybox
-VERSION   := 0.50
+VERSION   := 0.51pre
 BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
@@ -60,6 +60,10 @@ USE_SYSTEM_PWD_GRP = true
 # 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.
@@ -131,6 +135,12 @@ ifeq ($(strip $(DODMALLOC)),true)
     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
@@ -202,7 +212,7 @@ endif
 # And option 4:
 -include applet_source_list
 
-OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o applets.o mtab_file.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)"'
@@ -224,21 +234,24 @@ else
 endif
     
 LIBBB	  = libbb
-LIBBB_DIR = $(BB_SRC_DIR:=/)$(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 device_open.c error_msg.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 \
+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 
+verror_msg.c vperror_msg.c mtab.c mtab_file.c
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
-LIBBB_CFLAGS = -I$(LIBBB_DIR)
+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.
@@ -254,7 +267,12 @@ applet_source_list: busybox.sh Config.h
 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
@@ -308,7 +326,7 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
 
 
 busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS) 
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB) $(LIBBB_LIB)
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(PWD_LIB) $(LIBBB_LIB) $(LIBRARIES)
 	$(STRIP)
 
 # Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"