Changeset 904 in MondoRescue for trunk/mindi-busybox/libbb/Makefile.in

Timestamp:

Oct 25, 2006, 1:51:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

File:

• trunk/mindi-busybox/libbb/Makefile.in (modified) (2 diffs)

trunk/mindi-busybox/libbb/Makefile.in

@@ -30 +30 @@
     trim.c u_signal_names.c vdprintf.c verror_msg.c \
     vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xstat.c \
-    xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c \
+    xgethostbyname.c xgethostbyname2.c xreadlink.c xgetlarg.c \
     bb_xsocket.c bb_xdaemon.c bb_xbind.c bb_xlisten.c bb_xchdir.c \
     get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
@@ -51 +51 @@
 LIBBB-$(CONFIG_DF)+= find_mount_point.c
 LIBBB-$(CONFIG_EJECT)+= find_mount_point.c
+
+# We shouldn't build xregcomp.c if we don't need it - this ensures we don't
+# require regex.h to be in the include dir even if we don't need it thereby
+# allowing us to build busybox even if uclibc regex support is disabled.
+
+regex-y:=
+regex-$(CONFIG_AWK) += xregcomp.c
+regex-$(CONFIG_SED) += xregcomp.c
+regex-$(CONFIG_LESS) += xregcomp.c
+regex-$(CONFIG_DEVFSD) += xregcomp.c
+regex-$(CONFIG_MDEV) += xregcomp.c
+regex-$(CONFIG_GREP) += xregcomp.c
+
+# Sort has the happy side efect of returning a unique list
+LIBBB-y += $(sort $(regex-y))
 
 LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))