diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-03-05 17:57:34 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-03-05 17:57:34 +0000 |
commit | 17e71af7b333e6557912fe2e24a250d5c932ac3c (patch) | |
tree | 9dffd0a8bc304742621a435328243884a84e41a9 /Makefile | |
parent | e35641d00c87d6ed87c86d0387c38216650a8204 (diff) | |
download | busybox-w32-17e71af7b333e6557912fe2e24a250d5c932ac3c.tar.gz busybox-w32-17e71af7b333e6557912fe2e24a250d5c932ac3c.tar.bz2 busybox-w32-17e71af7b333e6557912fe2e24a250d5c932ac3c.zip |
Make sure libpwd.a is linked _last_ so it overrides the system pwd/grp
implementation. It wasn't doing that as expected...
git-svn-id: svn://busybox.net/trunk/busybox@1970 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -289,7 +289,7 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml | |||
289 | 289 | ||
290 | 290 | ||
291 | busybox: $(PWD_LIB) $(OBJECTS) | 291 | busybox: $(PWD_LIB) $(OBJECTS) |
292 | $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES) | 292 | $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB) |
293 | $(STRIP) | 293 | $(STRIP) |
294 | 294 | ||
295 | # Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h" | 295 | # 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 | |||
306 | - mkdir -p $(PWD_GRP) | 306 | - mkdir -p $(PWD_GRP) |
307 | $(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o | 307 | $(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o |
308 | 308 | ||
309 | $(PWD_LIB): $(PWD_OBJS) | 309 | libpwd.a: $(PWD_OBJS) |
310 | $(AR) $(ARFLAGS) $(PWD_LIB) $^ | 310 | $(AR) $(ARFLAGS) $@ $^ |
311 | 311 | ||
312 | usage.o: usage.h | 312 | usage.o: usage.h |
313 | 313 | ||
@@ -326,7 +326,7 @@ clean: | |||
326 | - rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \ | 326 | - rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \ |
327 | docs/busybox.pdf docs/busybox.lineo.com/busybox.html | 327 | docs/busybox.pdf docs/busybox.lineo.com/busybox.html |
328 | - rm -f multibuild.log Config.h.orig | 328 | - rm -f multibuild.log Config.h.orig |
329 | - rm -rf docs/busybox _install $(PWD_LIB) | 329 | - rm -rf docs/busybox _install libpwd.a |
330 | - rm -f busybox.links loop.h *~ slist.mk core applet_source_list | 330 | - rm -f busybox.links loop.h *~ slist.mk core applet_source_list |
331 | - find -name \*.o -exec rm -f {} \; | 331 | - find -name \*.o -exec rm -f {} \; |
332 | 332 | ||