From: Mike Frysinger Date: Sat, 13 May 2006 02:34:25 +0000 (-0000) Subject: pull Rules.mak from top_srcdir as pointed out by Robert P. J. Day on the mailing... X-Git-Tag: 1_1_3~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=158ffd405e3dace1c79cbbd6994d5b4936bfcd99;p=oweals%2Fbusybox.git pull Rules.mak from top_srcdir as pointed out by Robert P. J. Day on the mailing list --- diff --git a/applets/Makefile b/applets/Makefile index 155279942..0d892f5e5 100644 --- 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) diff --git a/archival/Makefile b/archival/Makefile index 2cb5ebc95..66da4afc1 100644 --- 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) diff --git a/archival/libunarchive/Makefile b/archival/libunarchive/Makefile index 3f0ebcec1..9ab1cac81 100644 --- 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) diff --git a/console-tools/Makefile b/console-tools/Makefile index 202b5347d..87a242b51 100644 --- 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) diff --git a/coreutils/Makefile b/coreutils/Makefile index f7fdc4bab..c29f3a934 100644 --- 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) diff --git a/coreutils/libcoreutils/Makefile b/coreutils/libcoreutils/Makefile index e8bc65d3d..fabde2d0e 100644 --- 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 diff --git a/debianutils/Makefile b/debianutils/Makefile index 614bfbe92..3d240b7bc 100644 --- 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) diff --git a/e2fsprogs/Makefile b/e2fsprogs/Makefile index a42290ee0..0efa9bb3b 100644 --- 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 diff --git a/editors/Makefile b/editors/Makefile index 941c4c76d..22790095a 100644 --- 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) diff --git a/findutils/Makefile b/findutils/Makefile index b02d69c99..f152c8126 100644 --- 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) diff --git a/init/Makefile b/init/Makefile index 828971ab1..63816f6aa 100644 --- 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) diff --git a/libbb/Makefile b/libbb/Makefile index 1d4f547c7..98b144c10 100644 --- 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) diff --git a/libpwdgrp/Makefile b/libpwdgrp/Makefile index 270cf53dd..630a7688f 100644 --- 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) diff --git a/loginutils/Makefile b/loginutils/Makefile index bbf28130e..b81f42964 100644 --- 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) diff --git a/miscutils/Makefile b/miscutils/Makefile index 64cd56e30..91b31ec9e 100644 --- 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) diff --git a/modutils/Makefile b/modutils/Makefile index fa7a2a31e..65090c5a2 100644 --- 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) diff --git a/networking/Makefile b/networking/Makefile index 98bd7f880..c3f2d79c9 100644 --- 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) diff --git a/networking/libiproute/Makefile b/networking/libiproute/Makefile index 96b1449e3..2fafae738 100644 --- 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) diff --git a/networking/udhcp/Makefile b/networking/udhcp/Makefile new file mode 100644 index 000000000..dbea9d4d0 --- /dev/null +++ b/networking/udhcp/Makefile @@ -0,0 +1,36 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2004 by Erik Andersen +# +# 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) + diff --git a/procps/Makefile b/procps/Makefile index 179371a18..1db6ffa58 100644 --- 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) diff --git a/shell/Makefile b/shell/Makefile index c29ec3464..9590f524e 100644 --- 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) diff --git a/sysklogd/Makefile b/sysklogd/Makefile index e6594f025..0ae4f1d35 100644 --- 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) diff --git a/util-linux/Makefile b/util-linux/Makefile index de51b7594..9a53470a4 100644 --- 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)