summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Andersen2001-03-05 17:57:34 +0000
committerEric Andersen2001-03-05 17:57:34 +0000
commitc27b9544b649d133d065b97c7076a2319ea522e6 (patch)
tree9dffd0a8bc304742621a435328243884a84e41a9 /Makefile
parent47cdcdd3598323a50ebcb2d47a8f5c5611caaee8 (diff)
downloadbusybox-c27b9544b649d133d065b97c7076a2319ea522e6.zip
busybox-c27b9544b649d133d065b97c7076a2319ea522e6.tar.gz
Make sure libpwd.a is linked _last_ so it overrides the system pwd/grp
implementation. It wasn't doing that as expected...
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8d9c06e..239f3cf 100644
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
busybox: $(PWD_LIB) $(OBJECTS)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB)
$(STRIP)
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
@@ -306,8 +306,8 @@ $(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
- mkdir -p $(PWD_GRP)
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
-$(PWD_LIB): $(PWD_OBJS)
- $(AR) $(ARFLAGS) $(PWD_LIB) $^
+libpwd.a: $(PWD_OBJS)
+ $(AR) $(ARFLAGS) $@ $^
usage.o: usage.h
@@ -326,7 +326,7 @@ clean:
- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
docs/busybox.pdf docs/busybox.lineo.com/busybox.html
- rm -f multibuild.log Config.h.orig
- - rm -rf docs/busybox _install $(PWD_LIB)
+ - rm -rf docs/busybox _install libpwd.a
- rm -f busybox.links loop.h *~ slist.mk core applet_source_list
- find -name \*.o -exec rm -f {} \;