From d791e72dc28009f36da26703fc007e40cfa79414 Mon Sep 17 00:00:00 2001 From: Nguyễn Thái Ngọc Duy Date: Wed, 22 Apr 2009 22:03:40 +1000 Subject: Kbuild/Config.in: add CONFIG_MINGW and imported files to build system --- Config.in | 5 +++++ libbb/Kbuild | 51 ++++++++++++++++++++++++++++++++++----------------- libpwdgrp/Kbuild | 2 ++ 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/Config.in b/Config.in index a04e11b5c..3c5699c32 100644 --- a/Config.in +++ b/Config.in @@ -37,6 +37,11 @@ config DESKTOP Select this only if you plan to use busybox on full-blown desktop machine with common Linux distro, not on an embedded box. +config MINGW32 + bool "Enable Windows native port" + default n + help + Enable MinGW port choice prompt "Buffer allocation policy" default FEATURE_BUFFERS_USE_MALLOC diff --git a/libbb/Kbuild b/libbb/Kbuild index e562f3222..4c8f542fc 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -6,12 +6,29 @@ lib-y:= -lib-y += ask_confirmation.o +ifndef CONFIG_MINGW32 lib-y += bb_askpass.o -lib-y += bb_do_delay.o lib-y += bb_pwd.o -lib-y += bb_strtonum.o lib-y += change_identity.o +lib-y += create_icmp6_socket.o +lib-y += create_icmp_socket.o +lib-y += device_open.o +lib-y += inet_common.o +lib-y += kernel_version.o +lib-y += login.o +lib-y += makedev.o +lib-y += match_fstype.o +lib-y += setup_environment.o +lib-y += speed_table.o +lib-y += vfork_daemon_rexec.o +lib-y += vinfo_msg.o +lib-y += xconnect.o +lib-y += xgethostbyname.o +endif + +lib-y += ask_confirmation.o +lib-y += bb_do_delay.o +lib-y += bb_strtonum.o lib-y += chomp.o lib-y += compare_string_array.o lib-y += concat_path_file.o @@ -19,10 +36,7 @@ lib-y += concat_subpath_file.o lib-y += copy_file.o lib-y += copyfd.o lib-y += crc32.o -lib-y += create_icmp6_socket.o -lib-y += create_icmp_socket.o lib-y += default_error_retval.o -lib-y += device_open.o lib-y += dump.o lib-y += error_msg.o lib-y += error_msg_and_die.o @@ -40,18 +54,13 @@ lib-y += getopt32.o lib-y += herror_msg.o lib-y += herror_msg_and_die.o lib-y += human_readable.o -lib-y += inet_common.o lib-y += info_msg.o lib-y += inode_hash.o lib-y += isdirectory.o -lib-y += kernel_version.o lib-y += last_char_is.o lib-y += lineedit.o lib-y += llist.o -lib-y += login.o lib-y += make_directory.o -lib-y += makedev.o -lib-y += match_fstype.o lib-y += md5.o lib-y += messages.o lib-y += mode_string.o @@ -72,11 +81,9 @@ lib-y += restricted_shell.o lib-y += run_shell.o lib-y += safe_strncpy.o lib-y += safe_write.o -lib-y += setup_environment.o lib-y += sha1.o lib-y += simplify_path.o lib-y += skip_whitespace.o -lib-y += speed_table.o lib-y += str_tolower.o lib-y += trim.o lib-y += u_signal_names.o @@ -84,18 +91,14 @@ lib-y += udp_io.o lib-y += uuencode.o lib-y += vdprintf.o lib-y += verror_msg.o -lib-y += vfork_daemon_rexec.o lib-y += vherror_msg.o -lib-y += vinfo_msg.o lib-y += vperror_msg.o lib-y += warn_ignoring_args.o lib-y += wfopen.o lib-y += wfopen_input.o lib-y += xatonum.o -lib-y += xconnect.o lib-y += xfuncs.o lib-y += xgetcwd.o -lib-y += xgethostbyname.o lib-y += xreadlink.o # conditionally compiled objects: @@ -124,3 +127,17 @@ lib-$(CONFIG_EXPR) += xregcomp.o lib-$(CONFIG_MDEV) += xregcomp.o lib-$(CONFIG_LESS) += xregcomp.o lib-$(CONFIG_DEVFSD) += xregcomp.o + +lib-$(CONFIG_MINGW32) += git.o +lib-$(CONFIG_MINGW32) += fnmatch.o +lib-$(CONFIG_MINGW32) += mingw.o +lib-$(CONFIG_MINGW32) += quote.o +lib-$(CONFIG_MINGW32) += regex.o +lib-$(CONFIG_MINGW32) += run-command.o +lib-$(CONFIG_MINGW32) += setenv.o +lib-$(CONFIG_MINGW32) += strbuf.o +lib-$(CONFIG_MINGW32) += strlcpy.o +lib-$(CONFIG_MINGW32) += trace.o +lib-$(CONFIG_MINGW32) += usage.o +lib-$(CONFIG_MINGW32) += winansi.o +lib-$(CONFIG_MINGW32) += write_or_die.o diff --git a/libpwdgrp/Kbuild b/libpwdgrp/Kbuild index f9f1ddbf3..1fbdfcab5 100644 --- a/libpwdgrp/Kbuild +++ b/libpwdgrp/Kbuild @@ -4,6 +4,8 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. +ifndef CONFIG_MINGW32 lib-y := uidgid_get.o +endif lib-$(CONFIG_USE_BB_PWD_GRP) += pwd_grp.o -- cgit v1.2.3-55-g6feb