svn commit: trunk/busybox: archival console-tools coreutils debianu etc...

landley at busybox.net landley at busybox.net
Tue Feb 21 19:11:38 UTC 2006 

Author: landley
Date: 2006-02-21 11:11:35 -0800 (Tue, 21 Feb 2006)
New Revision: 14165

Log:
Don't build directory libraries unless we're building an applet that needs it.
Cherry-picked from Devin Bayer's big MacOS X patch.


Modified:
   trunk/busybox/archival/Makefile.in
   trunk/busybox/console-tools/Makefile.in
   trunk/busybox/coreutils/Makefile.in
   trunk/busybox/debianutils/Makefile.in
   trunk/busybox/e2fsprogs/Makefile.in
   trunk/busybox/editors/Makefile.in
   trunk/busybox/findutils/Makefile.in
   trunk/busybox/init/Makefile.in
   trunk/busybox/loginutils/Makefile.in
   trunk/busybox/miscutils/Makefile.in
   trunk/busybox/modutils/Makefile.in
   trunk/busybox/networking/Makefile.in
   trunk/busybox/networking/udhcp/Makefile.in
   trunk/busybox/procps/Makefile.in
   trunk/busybox/shell/Makefile.in
   trunk/busybox/sysklogd/Makefile.in
   trunk/busybox/util-linux/Makefile.in


Changeset:
Modified: trunk/busybox/archival/Makefile.in
===================================================================
--- trunk/busybox/archival/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/archival/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -26,7 +26,9 @@
 ARCHIVAL-$(CONFIG_UNCOMPRESS)	+= uncompress.o
 ARCHIVAL-$(CONFIG_UNZIP)	+= unzip.o
 
+ifneq ($(strip $(ARCHIVAL-y)),)
 libraries-y+=$(ARCHIVAL_DIR)$(ARCHIVAL_AR)
+endif
 
 ARCHIVAL_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(ARCHIVAL-y))
 ARCHIVAL_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/console-tools/Makefile.in
===================================================================
--- trunk/busybox/console-tools/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/console-tools/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -22,7 +22,9 @@
 CONSOLETOOLS-$(CONFIG_RESET)	+= reset.o
 CONSOLETOOLS-$(CONFIG_SETKEYCODES)	+= setkeycodes.o
 
+ifneq ($(strip $(CONSOLETOOLS-y)),)
 libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
+endif
 CONSOLETOOLS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(CONSOLETOOLS-y))
 CONSOLETOOLS_SRC-a:=$(wildcard $(srcdir)/*.c)
 APPLET_SRC-y+=$(CONSOLETOOLS_SRC-y)

Modified: trunk/busybox/coreutils/Makefile.in
===================================================================
--- trunk/busybox/coreutils/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/coreutils/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -82,7 +82,11 @@
 COREUTILS-$(CONFIG_YES)       += yes.o
 
 COREUTILS-y:=$(sort $(COREUTILS-y))
+
+ifneq ($(strip $(COREUTILS-y)),)
 libraries-y+=$(COREUTILS_DIR)$(COREUTILS_AR)
+endif
+
 COREUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(COREUTILS-y))
 COREUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
 APPLET_SRC-y+=$(COREUTILS_SRC-y)

Modified: trunk/busybox/debianutils/Makefile.in
===================================================================
--- trunk/busybox/debianutils/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/debianutils/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -18,7 +18,9 @@
 DEBIANUTILS-$(CONFIG_START_STOP_DAEMON)	+= start_stop_daemon.o
 DEBIANUTILS-$(CONFIG_WHICH)		+= which.o
 
+ifneq ($(strip $(DEBIANUTILS-y)),)
 libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR)
+endif
 DEBIANUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(DEBIANUTILS-y))
 DEBIANUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
 APPLET_SRC-y+=$(DEBIANUTILS_SRC-y)

Modified: trunk/busybox/e2fsprogs/Makefile.in
===================================================================
--- trunk/busybox/e2fsprogs/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/e2fsprogs/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -64,7 +64,10 @@
 
 E2FSPROGS-y:=$(sort $(E2FSPROGS-y))
 
+ifneq ($(strip $(E2FSPROGS-y)),)
 libraries-y+=$(E2FSPROGS_DIR)/$(E2FSPROGS_AR)
+endif
+
 E2FSPROGS_SRC-y:=$(patsubst %.o,$(E2FSPROGS_SRC)/%.c,$(E2FSPROGS-y))
 E2FSPROGS_SRC-a:=$(wildcard $(E2FSPROGS_SRC)/*.c) $(patsubst %,$(E2FSPROGS_SRC)/%,$(BLKID_SRCS) $(E2P_SRCS) $(EXT2FS_SRCS) $(UUID_SRCS))
 APPLET_SRC-y+=$(E2FSPROGS_CFLAGS) $(E2FSPROGS_SRC-y)

Modified: trunk/busybox/editors/Makefile.in
===================================================================
--- trunk/busybox/editors/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/editors/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -16,7 +16,9 @@
 EDITOR-$(CONFIG_SED)       += sed.o
 EDITOR-$(CONFIG_VI)        += vi.o
 
+ifneq ($(strip $(EDITOR-y)),)
 libraries-y+=$(EDITOR_DIR)$(EDITOR_AR)
+endif
 
 EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITOR-y))
 EDITOR_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/findutils/Makefile.in
===================================================================
--- trunk/busybox/findutils/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/findutils/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -15,7 +15,9 @@
 FINDUTILS-$(CONFIG_GREP)	+= grep.o
 FINDUTILS-$(CONFIG_XARGS)	+= xargs.o
 
+ifneq ($(strip $(FINDUTILS-y)),)
 libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)
+endif
 
 FINDUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(FINDUTILS-y))
 FINDUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/init/Makefile.in
===================================================================
--- trunk/busybox/init/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/init/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -27,7 +27,9 @@
 
 INIT-$(CONFIG_INIT_SHARED)        += init_shared.o
 
+ifneq ($(strip $(INIT-y)),)
 libraries-y+=$(INIT_DIR)$(INIT_AR)
+endif
 
 INIT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(INIT-y))
 INIT_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/loginutils/Makefile.in
===================================================================
--- trunk/busybox/loginutils/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/loginutils/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -22,7 +22,9 @@
 LOGINUTILS-$(CONFIG_DELUSER)	+= deluser.o
 LOGINUTILS-$(CONFIG_DELGROUP)	+= delgroup.o
 
+ifneq ($(strip $(LOGINUTILS-y)),)
 libraries-y+=$(LOGINUTILS_DIR)$(LOGINUTILS_AR)
+endif
 
 LOGINUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(LOGINUTILS-y))
 LOGINUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/miscutils/Makefile.in
===================================================================
--- trunk/busybox/miscutils/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/miscutils/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -31,7 +31,9 @@
 MISCUTILS-$(CONFIG_TIME)        += time.o
 MISCUTILS-$(CONFIG_WATCHDOG)    += watchdog.o
 
+ifneq ($(strip $(MISCUTILS-y)),)
 libraries-y+=$(MISCUTILS_DIR)$(MISCUTILS_AR)
+endif
 
 MISCUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(MISCUTILS-y))
 MISCUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/modutils/Makefile.in
===================================================================
--- trunk/busybox/modutils/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/modutils/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -16,7 +16,9 @@
 MODUTILS-$(CONFIG_MODPROBE)		+= modprobe.o
 MODUTILS-$(CONFIG_RMMOD)		+= rmmod.o
 
+ifneq ($(strip $(MODUTILS-y)),)
 libraries-y+=$(MODUTILS_DIR)$(MODUTILS_AR)
+endif
 
 MODUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(MODUTILS-y))
 MODUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/networking/Makefile.in
===================================================================
--- trunk/busybox/networking/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/networking/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -44,7 +44,9 @@
 NETWORKING-$(CONFIG_ZCIP)         += zcip.o
 
 NETWORKING-y:=$(sort $(NETWORKING-y))
+ifneq ($(strip $(NETWORKING-y)),)
 libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR)
+endif
 
 NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y))
 NETWORKING_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/networking/udhcp/Makefile.in
===================================================================
--- trunk/busybox/networking/udhcp/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/networking/udhcp/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -32,7 +32,9 @@
 UDHCP-$(CONFIG_DUMPLEASES)	+= dumpleases.c
 UDHCP_OBJS:=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y))
 
+ifneq ($(strip $(UDHCP-y)),)
 libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
+endif
 
 UDHCP-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y))
 UDHCP-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/procps/Makefile.in
===================================================================
--- trunk/busybox/procps/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/procps/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -21,7 +21,9 @@
 PROCPS-$(CONFIG_UPTIME)		+= uptime.o
 PROCPS-$(CONFIG_FUSER)		+= fuser.o
 
+ifneq ($(strip $(PROCPS-y)),)
 libraries-y+=$(PROCPS_DIR)$(PROCPS_AR)
+endif
 
 PROCPS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(PROCPS-y))
 PROCPS_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/shell/Makefile.in
===================================================================
--- trunk/busybox/shell/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/shell/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -17,7 +17,9 @@
 SHELLT-$(CONFIG_MSH)				+= msh.o
 SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING)	+= cmdedit.o
 
+ifneq ($(strip $(SHELLT-y)),)
 libraries-y+=$(SHELL_DIR)$(SHELL_AR)
+endif
 
 SHELLT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SHELLT-y))
 SHELLT_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/sysklogd/Makefile.in
===================================================================
--- trunk/busybox/sysklogd/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/sysklogd/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -16,7 +16,9 @@
 SYSKLOGD-$(CONFIG_LOGREAD)		+= logread.o
 SYSKLOGD-$(CONFIG_SYSLOGD)		+= syslogd.o
 
+ifneq ($(strip $(SYSKLOGD-y)),)
 libraries-y+=$(SYSKLOGD_DIR)$(SYSKLOGD_AR)
+endif
 
 SYSKLOGD_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SYSKLOGD-y))
 SYSKLOGD_SRC-a:=$(wildcard $(srcdir)/*.c)

Modified: trunk/busybox/util-linux/Makefile.in
===================================================================
--- trunk/busybox/util-linux/Makefile.in	2006-02-21 18:34:54 UTC (rev 14164)
+++ trunk/busybox/util-linux/Makefile.in	2006-02-21 19:11:35 UTC (rev 14165)
@@ -38,8 +38,9 @@
 UTILLINUX-$(CONFIG_SWITCH_ROOT)   +=switch_root.o
 UTILLINUX-$(CONFIG_UMOUNT)        +=umount.o
 
-
+ifneq ($(strip $(UTILLINUX-y)),)
 libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR)
+endif
 
 UTILLINUX_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(UTILLINUX-y))
 UTILLINUX_SRC-a:=$(wildcard $(srcdir)/*.c)

More information about the busybox-cvs mailing list