summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2006-10-05 10:17:08 +0000
committerDenis Vlasenko2006-10-05 10:17:08 +0000
commit7d219aab70e6951ab82c27c202cac05016696723 (patch)
tree4c0679bfa391f71aee9b51505a5d3dc8f60a0cf7 /include
parent8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (diff)
downloadbusybox-7d219aab70e6951ab82c27c202cac05016696723.zip
busybox-7d219aab70e6951ab82c27c202cac05016696723.tar.gz
build system overhaul
Diffstat (limited to 'include')
-rw-r--r--include/bb_config.h142
-rw-r--r--include/busybox.h2
-rw-r--r--include/grp_.h2
-rw-r--r--include/libbb.h1
4 files changed, 142 insertions, 5 deletions
diff --git a/include/bb_config.h b/include/bb_config.h
new file mode 100644
index 0000000..beec07c
--- /dev/null
+++ b/include/bb_config.h
@@ -0,0 +1,142 @@
+/* Hack. kbuild will not define needed macros for config symbols
+ * which depend on other symbols, which themself are off.
+ * Provide them here by hand. Need a better idea. */
+
+#ifndef ENABLE_KILLALL5
+#define ENABLE_KILLALL5 0
+#define USE_KILLALL5(...)
+#define SKIP_KILLALL5(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_QUERY_MODULE_INTERFACE
+#define ENABLE_FEATURE_QUERY_MODULE_INTERFACE 0
+#define USE_FEATURE_QUERY_MODULE_INTERFACE(...)
+#define SKIP_FEATURE_QUERY_MODULE_INTERFACE(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_CLEAN_UP
+#define ENABLE_FEATURE_CLEAN_UP 0
+#define USE_FEATURE_CLEAN_UP(...)
+#define SKIP_FEATURE_CLEAN_UP(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_SH_STANDALONE_SHELL
+#define ENABLE_FEATURE_SH_STANDALONE_SHELL 0
+#define USE_FEATURE_SH_STANDALONE_SHELL(...)
+#define SKIP_FEATURE_SH_STANDALONE_SHELL(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_MTAB_SUPPORT
+#define ENABLE_FEATURE_MTAB_SUPPORT 0
+#define USE_FEATURE_MTAB_SUPPORT(...)
+#define SKIP_FEATURE_MTAB_SUPPORT(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_PRESERVE_HARDLINKS
+#define ENABLE_FEATURE_PRESERVE_HARDLINKS 0
+#define USE_FEATURE_PRESERVE_HARDLINKS(...)
+#define SKIP_FEATURE_PRESERVE_HARDLINKS(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_AUTOWIDTH
+#define ENABLE_FEATURE_AUTOWIDTH 0
+#define USE_FEATURE_AUTOWIDTH(...)
+#define SKIP_FEATURE_AUTOWIDTH(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_SUID_CONFIG
+#define ENABLE_FEATURE_SUID_CONFIG 0
+#define USE_FEATURE_SUID_CONFIG(...)
+#define SKIP_FEATURE_SUID_CONFIG(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_APP_DUMPLEASES
+#define ENABLE_APP_DUMPLEASES 0
+#define USE_APP_DUMPLEASES(...)
+#define SKIP_APP_DUMPLEASES(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_E2LABEL
+#define ENABLE_E2LABEL 0
+#define USE_E2LABEL(...)
+#define SKIP_E2LABEL(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_GREP_EGREP_ALIAS
+#define ENABLE_FEATURE_GREP_EGREP_ALIAS 0
+#define USE_FEATURE_GREP_EGREP_ALIAS(...)
+#define SKIP_FEATURE_GREP_EGREP_ALIAS(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_GREP_FGREP_ALIAS
+#define ENABLE_FEATURE_GREP_FGREP_ALIAS 0
+#define USE_FEATURE_GREP_FGREP_ALIAS(...)
+#define SKIP_FEATURE_GREP_FGREP_ALIAS(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FINDFS
+#define ENABLE_FINDFS 0
+#define USE_FINDFS(...)
+#define SKIP_FINDFS(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_IPADDR
+#define ENABLE_IPADDR 0
+#define USE_IPADDR(...)
+#define SKIP_IPADDR(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_IPLINK
+#define ENABLE_IPLINK 0
+#define USE_IPLINK(...)
+#define SKIP_IPLINK(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_IPROUTE
+
+#define ENABLE_IPROUTE 0
+#define USE_IPROUTE(...)
+#define SKIP_IPROUTE(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_IPTUNNEL
+#define ENABLE_IPTUNNEL 0
+#define USE_IPTUNNEL(...)
+#define SKIP_IPTUNNEL(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_KILLALL
+#define ENABLE_KILLALL 0
+#define USE_KILLALL(...)
+#define SKIP_KILLALL(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_KLOGD
+#define ENABLE_KLOGD 0
+#define USE_KLOGD(...)
+#define SKIP_KLOGD(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_FEATURE_INITRD
+#define ENABLE_FEATURE_INITRD 0
+#define USE_FEATURE_INITRD(...)
+#define SKIP_FEATURE_INITRD(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_LOGREAD
+#define ENABLE_LOGREAD 0
+#define USE_LOGREAD(...)
+#define SKIP_LOGREAD(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_PING6
+#define ENABLE_PING6 0
+#define USE_PING6(...)
+#define SKIP_PING6(...) __VA_ARGS__
+#endif
+
+#ifndef ENABLE_UNIX2DOS
+#define ENABLE_UNIX2DOS 0
+#define USE_UNIX2DOS(...)
+#define SKIP_UNIX2DOS(...) __VA_ARGS__
+#endif
diff --git a/include/busybox.h b/include/busybox.h
index fbda6ef..d20337f 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -7,8 +7,6 @@
#ifndef _BB_INTERNAL_H_
#define _BB_INTERNAL_H_ 1
-#include "bb_config.h"
-
#include "libbb.h"
/* order matters: used as index into "install_dir[]" in busybox.c */
diff --git a/include/grp_.h b/include/grp_.h
index 3ac5c84..b34addf 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -30,12 +30,10 @@
#ifndef _GRP_H
#define _GRP_H 1
-
#include <sys/types.h>
#include <features.h>
#include <stdio.h>
-
/* The group structure. */
struct group
{
diff --git a/include/libbb.h b/include/libbb.h
index 88847ac..ed1d780 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -377,7 +377,6 @@ extern const char *applet_name;
extern const char bb_msg_full_version[];
extern const char bb_msg_memory_exhausted[];
extern const char bb_msg_invalid_date[];
-extern const char bb_msg_io_error[];
extern const char bb_msg_read_error[];
extern const char bb_msg_write_error[];
extern const char bb_msg_name_longer_than_foo[];