diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-01 22:54:48 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-01 22:54:48 +0000 |
commit | 5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf (patch) | |
tree | 233c051da862595b6e473e832051708e2d9803cb /applets | |
parent | 12c2429a4242a157217c5bc9673a531fa1e1de61 (diff) | |
download | busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.tar.gz busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.tar.bz2 busybox-w32-5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf.zip |
- fixes parallel builds (make -j)
- use less resources for the buildsystem itself
Diffstat (limited to 'applets')
-rw-r--r-- | applets/Makefile.in | 20 | ||||
-rwxr-xr-x | applets/install.sh | 3 |
2 files changed, 7 insertions, 16 deletions
diff --git a/applets/Makefile.in b/applets/Makefile.in index 02bcda93b..64aefc017 100644 --- a/applets/Makefile.in +++ b/applets/Makefile.in | |||
@@ -4,23 +4,13 @@ | |||
4 | # | 4 | # |
5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. |
6 | 6 | ||
7 | APPLETS_AR:=applets.a | ||
8 | ifndef $(APPLETS_DIR) | ||
9 | APPLETS_DIR:=$(top_builddir)/applets/ | ||
10 | endif | ||
11 | srcdir=$(top_srcdir)/applets | 7 | srcdir=$(top_srcdir)/applets |
8 | objdir=$(top_builddir)/applets | ||
12 | 9 | ||
13 | APPLET_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c version.c) | 10 | APPLETS_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c version.c) |
14 | APPLET_OBJ:= $(patsubst $(srcdir)/%.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) | ||
15 | 11 | ||
16 | APPLET_SRC-y+=$(APPLET_SRC) | 12 | APPLET_SRC-y+=$(APPLETS_SRC) |
17 | APPLET_SRC-a+=$(APPLET_SRC) | 13 | APPLET_SRC-a+=$(APPLETS_SRC) |
18 | 14 | ||
19 | libraries-y+=$(APPLETS_DIR)$(APPLETS_AR) | 15 | applets_OBJ:=$(patsubst $(srcdir)/%.c,$(objdir)/%.o,$(APPLETS_SRC)) |
20 | 16 | ||
21 | $(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ) | ||
22 | $(do_ar) | ||
23 | |||
24 | $(APPLET_OBJ): $(top_builddir)/.config | ||
25 | $(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c | ||
26 | $(compile.c) | ||
diff --git a/applets/install.sh b/applets/install.sh index 2c643f2f2..0173e7a44 100755 --- a/applets/install.sh +++ b/applets/install.sh | |||
@@ -28,7 +28,8 @@ if [ "$DO_INSTALL_LIBS" != "n" ]; then | |||
28 | for i in $DO_INSTALL_LIBS; do | 28 | for i in $DO_INSTALL_LIBS; do |
29 | rm -f $prefix/$libdir/$i || exit 1 | 29 | rm -f $prefix/$libdir/$i || exit 1 |
30 | if [ -f $i ]; then | 30 | if [ -f $i ]; then |
31 | install -m 644 $i $prefix/$libdir/ || exit 1 | 31 | cp -a $i $prefix/$libdir/ || exit 1 |
32 | chmod 0644 $prefix/$libdir/$i || exit 1 | ||
32 | fi | 33 | fi |
33 | done | 34 | done |
34 | fi | 35 | fi |