There is no need to have a separate 'Makefile.in' file in the

general case, therefore, combine the toplevel Makefile options
such as setting TARGETS into the per-package *.mk file

10 files changed, 53 insertions, 24 deletions

diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index 5b2d7f213..bc2d26dfb 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -5,3 +5,6 @@ endif
 
 # FIXME -- this is temporary
 OPTIMIZE_FOR_CPU=$(ARCH)
+
+# gcc has a bunch of needed stuff....
+include toolchain/gcc/Makefile.in
diff --git a/toolchain/binutils/Makefile.in b/toolchain/binutils/Makefile.in
deleted file mode 100644
index c6838bb05..000000000
--- a/toolchain/binutils/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION)))
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index afbb63ac3..900060d33 100644
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -132,3 +132,9 @@ binutils_target-clean:
 
 binutils_target-dirclean:
 	rm -rf $(BINUTILS_DIR2)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION)))
diff --git a/toolchain/ccache/Makefile.in b/toolchain/ccache/Makefile.in
deleted file mode 100644
index fe859da30..000000000
--- a/toolchain/ccache/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-ifeq ($(strip $(BR2_CCACHE)),y)
-TARGETS+=ccache
-endif
-ifeq ($(strip $(BR2_PACKAGE_CCACHE_TARGET)),y)
-TARGETS+=ccache_target
-endif
diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index e2fdd71cc..71dfcde69 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -149,3 +149,14 @@ ccache_target-clean:
 
 ccache_target-dirclean:
 	rm -rf $(CCACHE_DIR2)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_CCACHE)),y)
+TARGETS+=ccache
+endif
+ifeq ($(strip $(BR2_PACKAGE_CCACHE_TARGET)),y)
+TARGETS+=ccache_target
+endif
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index e1fb6fec3..c89eb4227 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -1,3 +1,9 @@
+# gcc has a bunch of options that need to be shared with
+# both gcc-uclibc-2.95.mk and gcc-uclibc-3.x.mk, and are
+# use by other packages...  So include them in this file
+# and arrange to include it soon after invoking make from
+# the top level.
+
 GCC_VERSION:=$(strip $(subst ",, $(BR2_GCC_VERSION)))
 #"
 GCC_USE_SJLJ_EXCEPTIONS:=$(strip $(subst ",, $(BR2_GCC_USE_SJLJ_EXCEPTIONS)))
diff --git a/toolchain/gdb/Makefile.in b/toolchain/gdb/Makefile.in
deleted file mode 100644
index 50828d86f..000000000
--- a/toolchain/gdb/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-GDB_VERSION:=$(strip $(subst ",, $(BR2_GDB_VERSION)))
-#"
-
-ifeq ($(strip $(BR2_PACKAGE_GDB)),y)
-TARGETS+=gdb_target
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_GDB_SERVER)),y)
-TARGETS+=gdbserver
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_GDB_CLIENT)),y)
-TARGETS+=gdbclient
-endif
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 7c3c8deaa..e8212e93f 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -187,3 +187,22 @@ gdbclient-dirclean:
 
 
 
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+GDB_VERSION:=$(strip $(subst ",, $(BR2_GDB_VERSION)))
+#"
+
+ifeq ($(strip $(BR2_PACKAGE_GDB)),y)
+TARGETS+=gdb_target
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_GDB_SERVER)),y)
+TARGETS+=gdbserver
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_GDB_CLIENT)),y)
+TARGETS+=gdbclient
+endif
diff --git a/toolchain/kernel-headers/Makefile.in b/toolchain/kernel-headers/Makefile.in
deleted file mode 100644
index d02613a02..000000000
--- a/toolchain/kernel-headers/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-DEFAULT_KERNEL_HEADERS:=$(strip $(subst ",, $(BR2_DEFAULT_KERNEL_HEADERS)))
-#"
-
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index f5640a472..abb6e5389 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -143,3 +143,11 @@ kernel-headers-dirclean:
 	rm -rf $(LINUX_HEADERS_DIR)
 
 endif
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+DEFAULT_KERNEL_HEADERS:=$(strip $(subst ",, $(BR2_DEFAULT_KERNEL_HEADERS)))
+#"
+