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

diff --git a/Makefile b/Makefile
index d6d7c6214..2b31895e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2000 Erik Andersen <andersee@debian.org>
-# Copyright (C) 2000 Karl M. Hegbloom <karlheg@debian.org>
+# Copyright (C) 1999,2000,2001 Erik Andersen <andersee@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,8 +18,8 @@
 #
 
 PROG      := busybox
-VERSION   := 0.48pre
-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
@@ -28,15 +27,30 @@ export VERSION
 # overridden at the command line.  For example:
 #   make CROSS=powerpc-linux- BB_SRC_DIR=$HOME/busybox PREFIX=/mnt/app
 
+# If you want to add some simple compiler switches (like -march=i686),
+# especially from the command line, use this instead of CFLAGS directly.
+# For optimization overrides, it's better still to set OPTIMIZATION.
+CFLAGS_EXTRA =
+ 
 # If you want a static binary, turn this on.
 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
+# 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).
+# 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/ )
 # which is an excellent public domain mem leak and malloc problem
 # detector.  To enable dmalloc, before running busybox you will
@@ -45,6 +59,10 @@ DODEBUG = false
 # 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.
@@ -57,53 +75,82 @@ DOLFS = false
 # If you have a "pristine" source directory, point BB_SRC_DIR to it.
 # Experimental and incomplete; tell the mailing list
 # <busybox@opensource.lineo.com> if you do or don't like it so far.
-BB_SRC_DIR = .
+BB_SRC_DIR =
 
 # If you are running a cross compiler, you may want to set this
 # to something more interesting, like "powerpc-linux-".
 CROSS =
 CC = $(CROSS)gcc
+AR = $(CROSS)ar
 STRIPTOOL = $(CROSS)strip
 
-# To compile vs an alternative libc, you may need to use/adjust
-# the following lines to meet your needs.  This is how I make
-# busybox compile with uC-Libc...
-#LIBCDIR=/home/andersen/CVS/uC-libc
-#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
-#CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
-#LDFLAGS+=-nostdlib
-#LIBRARIES = $(LIBCDIR)/libc.a -lgcc
+# 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/i386-uclibc-gcc
 
-#--------------------------------------------------------
+# To compile vs some other alternative libc, you may need to use/adjust
+# the following lines to meet your needs...
+#
+# 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)/lib/libc.a -lgcc
+#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
+#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
 
 # use '-Os' optimization if available, else use -O2
-OPTIMIZATION = $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
+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
 
-ifeq ($(DOLFS),true)
+#
+#--------------------------------------------------------
+# If you're going to do a lot of builds with a non-vanilla configuration,
+# it makes sense to adjust parameters above, so you can type "make"
+# by itself, instead of following it by the same half-dozen overrides
+# every time.  The stuff below, on the other hand, is probably less
+# prone to casual user adjustment.
+# 
+
+ifeq ($(strip $(DOLFS)),true)
     # For large file summit support
     CFLAGS+=-D_FILE_OFFSET_BITS=64
 endif
-ifeq ($(DODMALLOC),true)
+ifeq ($(strip $(DODMALLOC)),true)
     # For testing mem leaks with dmalloc
     CFLAGS+=-DDMALLOC
     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
-# -D_GNU_SOURCE is needed because environ is used in init.c
-ifeq ($(DODEBUG),true)
-    CFLAGS += $(WARNINGS) -g -D_GNU_SOURCE
-    LDFLAGS += 
-    STRIP   =
+ifeq ($(strip $(DODEBUG)),true)
+    CFLAGS  += $(WARNINGS) -g -D_GNU_SOURCE
+    LDFLAGS += -Wl,-warn-common
+    STRIP    =
 else
     CFLAGS  += $(WARNINGS) $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
-    LDFLAGS  += -s
+    LDFLAGS += -s -Wl,-warn-common
     STRIP    = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
 endif
-ifeq ($(DOSTATIC),true)
+ifeq ($(strip $(DOSTATIC)),true)
     LDFLAGS += --static
     #
     #use '-ffunction-sections -fdata-sections' and '--gc-sections' (if they 
@@ -123,58 +170,145 @@ ifndef $(PREFIX)
 endif
 
 # Additional complications due to support for pristine source dir.
-# Config.h in the build directory should take precedence over the
-# copy in BB_SRC_DIR, both during the compilation phase and the
+# Include files in the build directory should take precedence over
+# the copy in BB_SRC_DIR, both during the compilation phase and the
 # shell script that finds the list of object files.
-#
 # Work in progress by <ldoolitt@recycle.lbl.gov>.
-# If it gets in your way, set DISABLE_VPATH=yes
-ifeq ($(DISABLE_VPATH),yes)
-    CONFIG_H = Config.h
-else
-    VPATH = .:$(BB_SRC_DIR)
-    CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH)))
-    CONFIG_H    = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null))
-    CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH)))
+#
+ifneq ($(strip $(BB_SRC_DIR)),)
+    VPATH = $(BB_SRC_DIR)
 endif
-
-OBJECTS   = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o
+#ifneq ($(strip $(VPATH)),)
+#    CFLAGS += -I- -I. $(patsubst %,-I%,$(subst :, ,$(VPATH)))
+#endif
+
+# We need to set APPLET_SOURCES to something like
+#   $(shell busybox.sh Config.h)
+# but in a manner that works with VPATH and BB_SRC_DIR.
+# Possible ways to approach this:
+#
+#   1. Explicitly search through .:$(VPATH) for busybox.sh and config.h,
+#      then $(shell $(BUSYBOX_SH) $(CONFIG_H) $(BB_SRC_DIR))
+#
+#   2. Explicity search through .:$(VPATH) for slist.mk,
+#      then $(shell $(MAKE) -f $(SLIST_MK) VPATH=$(VPATH) BB_SRC_DIR=$(BB_SRC_DIR))
+#
+#   3. Create slist.mk in this directory, with commands embedded in
+#      a $(shell ...) command, and $(MAKE) it immediately.
+#
+#   4. Use a real rule within this makefile to create a file that sets 
+#      APPLET_SOURCE_LIST, then include that file.  Has complications
+#      with the first trip through the makefile (before processing the
+#      include) trying to do too much, and a spurious warning the first
+#      time make is run.
+#
+# This is option 3:
+#
+#APPLET_SOURCES = $(shell \
+#   echo -e 'all: busybox.sh Config.h\n\t@ $$(SHELL) $$^ $$(BB_SRC_DIR)' >slist.mk; \
+#   make -f slist.mk VPATH=$(VPATH) BB_SRC_DIR=$(BB_SRC_DIR) \
+#)
+# And option 4:
+-include applet_source_list
+
+OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
+CFLAGS    += $(CROSS_CFLAGS)
 CFLAGS    += -DBB_VER='"$(VERSION)"'
 CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
 ifdef BB_INIT_SCRIPT
     CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
 endif
 
+ifneq ($(strip $(USE_SYSTEM_PWD_GRP)),true)
+    PWD_GRP	= pwd_grp
+    PWD_GRP_DIR = $(BB_SRC_DIR:=/)$(PWD_GRP)
+    PWD_LIB     = libpwd.a
+    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
+    PWD_OBJS=$(patsubst %.c,$(PWD_GRP)/%.o, $(PWD_CSRC))
+    PWD_CFLAGS = -I$(PWD_GRP_DIR)
+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.
+CFLAGS += $(CFLAGS_EXTRA)
 
-all: busybox busybox.links doc
+.EXPORT_ALL_VARIABLES:
+
+all: applet_source_list busybox busybox.links doc
+
+applet_source_list: busybox.sh Config.h
+	(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
 	@echo BusyBox Documentation
 	@echo
-	- mkdir -p docs
-	- (cd $(BB_SRC_DIR); pod2text docs/busybox.pod) > docs/BusyBox.txt
+	-mkdir -p docs
+	-pod2text $< > $@
 
 docs/BusyBox.1: docs/busybox.pod
 	- mkdir -p docs
-	- (cd $(BB_SRC_DIR); pod2man --center=BusyBox \
-		--release="version $(VERSION)" \
-		docs/busybox.pod ) > docs/BusyBox.1
+	- pod2man --center=BusyBox --release="version $(VERSION)" \
+		$< > $@
 
 docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
+	- mkdir -p docs
 	-@ rm -f docs/BusyBox.html
-	-@ ln -s docs/busybox.lineo.com/BusyBox.html docs/BusyBox.html
+	-@ ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
 
 docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
 	-@ mkdir -p docs/busybox.lineo.com
-	- (cd $(BB_SRC_DIR); pod2html --noindex docs/busybox.pod ) \
-		> docs/busybox.lineo.com/BusyBox.html
-	-@ rm -f pod2html*
+	-  pod2html --noindex $< > \
+	    docs/busybox.lineo.com/BusyBox.html
+	-@ rm -f pod2htm*
 
 
 # New docs based on DOCBOOK SGML
@@ -185,43 +319,76 @@ docs/busybox.txt: docs/busybox.sgml
 	@echo BusyBox Documentation
 	@echo
 	- mkdir -p docs
-	(cd docs; sgmltools -b txt $(BB_SRC_DIR)/busybox.sgml)
+	(cd docs; sgmltools -b txt busybox.sgml)
 
 docs/busybox.dvi: docs/busybox.sgml
 	- mkdir -p docs
-	(cd docs; sgmltools -b dvi $(BB_SRC_DIR)/busybox.sgml)
+	(cd docs; sgmltools -b dvi busybox.sgml)
 
 docs/busybox.ps: docs/busybox.sgml
 	- mkdir -p docs
-	(cd docs; sgmltools -b ps $(BB_SRC_DIR)/busybox.sgml)
+	(cd docs; sgmltools -b ps busybox.sgml)
 
 docs/busybox.pdf: docs/busybox.ps
 	- mkdir -p docs
-	(cd docs; ps2pdf $(BB_SRC_DIR)/busybox.ps)
+	(cd docs; ps2pdf busybox.ps)
 
 docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
 	- mkdir -p docs
 	(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
 
 
-
-busybox: $(OBJECTS) 
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
+busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS) 
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBBB_LIB) $(PWD_LIB) $(LIBRARIES)
 	$(STRIP)
 
-busybox.links: Config.h
-	-$(BB_SRC_DIR)/busybox.mkll $(BB_SRC_DIR)/applets.h | sort >$@
+# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
+# but with VPATH, some or all of those file names are resolved to the
+# directories in which they live.
+busybox.links: busybox.mkll Config.h applets.h
+	- $(SHELL) $^ >$@
 
 nfsmount.o cmdedit.o: %.o: %.h
-$(OBJECTS): %.o: %.c Config.h busybox.h Makefile
+sh.o: cmdedit.h
+$(OBJECTS): %.o: %.c Config.h busybox.h applets.h Makefile
+	$(CC) -I- $(CFLAGS) -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o
+
+$(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
+	- 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) $@ $^
 
-utility.o: loop.h
+libbb.a:  $(LIBBB_MOBJ) $(LIBBB_AROBJS) $(LIBBB_OBJS)
+	$(AR) $(ARFLAGS) $@ $^
 
-loop.h: mk_loop_h.sh
-	@ sh $<
+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
+	@ $(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
@@ -229,23 +396,23 @@ clean:
 	    docs/busybox.lineo.com/BusyBox.html
 	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
 	    docs/busybox.pdf docs/busybox.lineo.com/busybox.html
-	- rm -rf docs/busybox _install
-	- rm -f busybox.links loop.h *~ *.o core
+	- rm -f multibuild.log Config.h.orig
+	- 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: busybox busybox.links
-	$(BB_SRC_DIR)/install.sh $(PREFIX)
+install: install.sh busybox busybox.links
+	$(SHELL) $< $(PREFIX)
 
-install-hardlinks: busybox busybox.links
-	$(BB_SRC_DIR)/install.sh $(PREFIX) --hardlinks
+install-hardlinks: install.sh busybox busybox.links
+	$(SHELL) $< $(PREFIX) --hardlinks
 
 debug_pristine:
 	@ echo VPATH=\"$(VPATH)\"
-	@ echo CONFIG_LIST=\"$(CONFIG_LIST)\"
-	@ echo CONFIG_H=\"$(CONFIG_H)\"
 	@ echo OBJECTS=\"$(OBJECTS)\"
 
 dist release: distclean doc
@@ -256,17 +423,12 @@ dist release: distclean doc
 	find busybox-$(VERSION)/ -type d	\
 				 -name CVS	\
 				 -print		\
-		| xargs rm -rf;			\
-						\
-	find busybox-$(VERSION)/ -type f	\
-				 -name .cvsignore \
-				 -print		\
-		| xargs rm -f;			\
+		-exec rm -rf {} \; ;            \
 						\
 	find busybox-$(VERSION)/ -type f	\
 				 -name .\#*	\
 				 -print		\
-		| xargs rm -f;			\
+		-exec rm -f {} \;  ;            \
 						\
 	tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;