From 68012b7ea61ae78c3caaf57c90e53ecc8a5515b2 Mon Sep 17 00:00:00 2001
From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Thu, 5 Oct 2006 17:11:08 +0000
Subject: fixing build system overhaul fallout...
git-svn-id: svn://busybox.net/trunk/busybox@16309 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
Makefile | 6 +++---
Makefile.custom | 2 +-
include/bb_config.h | 6 ++++++
scripts/mkmakefile | 36 ++++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+), 4 deletions(-)
create mode 100755 scripts/mkmakefile
diff --git a/Makefile b/Makefile
index 4b49208d1..d85eb8a63 100644
--- a/Makefile
+++ b/Makefile
@@ -565,7 +565,7 @@ busybox-all := $(core-y) $(libs-y)
# Rule to link busybox - also used during CONFIG_KALLSYMS
# May be overridden by arch/$(ARCH)/Makefile
quiet_cmd_busybox__ ?= LINK $@
- cmd_busybox__ ?= scripts/trylink $(CC) -o $@ \
+ cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) -o $@ \
-Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
-Wl,--start-group $(busybox-all) -Wl,--end-group \
@@ -798,10 +798,10 @@ include/config/MARKER: scripts/basic/split-include include/autoconf.h
@echo ' SPLIT include/autoconf.h -> include/config/*'
@scripts/basic/split-include include/autoconf.h include/config
@echo ' GEN include/bbconfigopts.h'
- @scripts/mkconfigs >include/bbconfigopts.h
+ @$(srctree)/scripts/mkconfigs >include/bbconfigopts.h
@$(MAKE) $(build)=scripts
@echo ' GEN include/usage_compressed.h'
- @scripts/usage_compressed include/usage_compressed.h scripts
+ @$(srctree)/scripts/usage_compressed include/usage_compressed.h scripts
@touch $@
# Generate some files
diff --git a/Makefile.custom b/Makefile.custom
index 6880b97d6..c0984e17a 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -78,7 +78,7 @@ baseline: busybox_unstripped
.PHONY: objsizes
objsizes: busybox_unstripped
- $(SHELL) $(srctree)/scripts/objsizes
+ $(srctree)/scripts/objsizes
# Documentation Targets
.PHONY: doc
diff --git a/include/bb_config.h b/include/bb_config.h
index beec07cba..1f96026fd 100644
--- a/include/bb_config.h
+++ b/include/bb_config.h
@@ -2,6 +2,12 @@
* which depend on other symbols, which themself are off.
* Provide them here by hand. Need a better idea. */
+#ifndef ENABLE_FEATURE_GUNZIP_UNCOMPRESS
+#define ENABLE_FEATURE_GUNZIP_UNCOMPRESS 0
+#define USE_FEATURE_GUNZIP_UNCOMPRESS(...)
+#define SKIP_FEATURE_GUNZIP_UNCOMPRESS(...) __VA_ARGS__
+#endif
+
#ifndef ENABLE_KILLALL5
#define ENABLE_KILLALL5 0
#define USE_KILLALL5(...)
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
new file mode 100755
index 000000000..7f9d544f9
--- /dev/null
+++ b/scripts/mkmakefile
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Generates a small Makefile used in the root of the output
+# directory, to allow make to be started from there.
+# The Makefile also allow for more convinient build of external modules
+
+# Usage
+# $1 - Kernel src directory
+# $2 - Output directory
+# $3 - version
+# $4 - patchlevel
+
+
+test ! -r $2/Makefile -o -O $2/Makefile || exit 0
+echo " GEN $2/Makefile"
+
+cat << EOF > $2/Makefile
+# Automatically generated by $0: don't edit
+
+VERSION = $3
+PATCHLEVEL = $4
+
+KERNELSRC := $1
+KERNELOUTPUT := $2
+
+MAKEFLAGS += --no-print-directory
+
+.PHONY: all \$(MAKECMDGOALS)
+
+all:
+ \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT)
+
+Makefile:;
+
+\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
+ \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+EOF
--
cgit v1.2.3-55-g6feb