pull Rules.mak from top_srcdir as pointed out by Robert P. J. Day on the mailing list

2006-05-13 02:34:25 +00:00 · 2006-05-13 02:34:25 +00:00 · 158ffd405e
parent 7a3d25e370
commit 158ffd405e
23 changed files with 58 additions and 22 deletions
--- a/applets/Makefile
+++ b/applets/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/applets
 APPLETS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/archival/Makefile
+++ b/archival/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 ARCHIVAL_DIR:=./
 srcdir=$(top_srcdir)/archival
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/archival/libunarchive/Makefile
+++ b/archival/libunarchive/Makefile
@ -25,7 +25,7 @@ top_builddir=../..
 endif
 srcdir=$(top_srcdir)/archival/libunarchive
 LIBUNARCHIVE_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/console-tools/Makefile
+++ b/console-tools/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/console/tools
 CONSOLETOOLS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/coreutils/Makefile
+++ b/coreutils/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/coreutils
 SHELLUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/coreutils/libcoreutils/Makefile
+++ b/coreutils/libcoreutils/Makefile
@ -25,7 +25,7 @@ top_builddir=../..
 endif
 srcdir=$(top_srcdir)/coreutils/libcoreutils
 LIBCOREUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in

--- a/debianutils/Makefile
+++ b/debianutils/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/debianutils
 DEBIANUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/e2fsprogs/Makefile
+++ b/e2fsprogs/Makefile
@ -13,7 +13,7 @@ endif
 srcdir=$(top_srcdir)/e2fsprogs
 E2FSPROGS_DIR:=./
 include $(top_builddir)/.config
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include Makefile.in
 all: $(libraries-y)
 -include $(top_builddir)/.depend
--- a/editors/Makefile
+++ b/editors/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/editors
 EDITOR_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/findutils/Makefile
+++ b/findutils/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/findutils
 FINDUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/init/Makefile
+++ b/init/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/init
 INIT_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include $(srcdir)/Makefile.in
 all: $(libraries-y)
--- a/libbb/Makefile
+++ b/libbb/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/libbb
 LIBBB_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/libpwdgrp/Makefile
+++ b/libpwdgrp/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/libpwgrp
 LIBPWDGRP_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/loginutils/Makefile
+++ b/loginutils/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/loginutils
 LOGINUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/miscutils/Makefile
+++ b/miscutils/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/miscutils
 MISCUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/modutils/Makefile
+++ b/modutils/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/modutils
 MODUTILS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/networking/Makefile
+++ b/networking/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/networking
 NETWORKING_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/networking/libiproute/Makefile
+++ b/networking/libiproute/Makefile
@ -25,7 +25,7 @@ top_builddir=../..
 endif
 srcdir=$(top_srcdir)/networking/libiproute
 LIBIPROUTE_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/networking/udhcp/Makefile
+++ b/networking/udhcp/Makefile
@ -0,0 +1,36 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+ifndef top_srcdir
+top_srcdir=../..
+endif
+ifndef top_builddir
+top_builddir=../..
+endif
+srcdir=$(top_srcdir)/networking/udhcp
+UDHCP_DIR:=./
+include $(top_srcdir)/Rules.mak
+include $(top_builddir)/.config
+include Makefile.in
+all: $(libraries-y)
+-include $(top_builddir)/.depend
+
+clean:
+	rm -f *.o *.a $(AR_TARGET)
+
--- a/procps/Makefile
+++ b/procps/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/procps
 PROCPS_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/shell/Makefile
+++ b/shell/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/shell
 SHELL_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/sysklogd/Makefile
+++ b/sysklogd/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/sysklogd
 SYSKLOGD_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@ -12,7 +12,7 @@ top_builddir=..
 endif
 srcdir=$(top_srcdir)/util-linux
 UTILLINUX_DIR:=./
-include $(top_builddir)/Rules.mak
+include $(top_srcdir)/Rules.mak
 include $(top_builddir)/.config
 include Makefile.in
 all: $(libraries-y)