This one should be able to deal with the USAGE macros a little

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index e0f8880871339f77667f1e2f7f3c7b046dc5e395..ad1d9ad68355ee252de13f02bd3ea1ac41bdbdff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ AR = $(CROSS)ar
 STRIPTOOL = $(CROSS)strip
 
 # To compile vs uClibc, just use the compiler wrapper built by uClibc...
-# Isn't that easy?  Right now, uClibc needs BB_FEATURE_NFSMOUNT disabled 
-# since uClibc's nfs support isn't ready yet.
+# This make things very easy?  Everything should compile and work as
+# expected these days...
 #CC = ../uClibc/extra/gcc-uClibc/gcc-uClibc-i386
 
 # To compile vs some other alternative libc, you may need to use/adjust
@@ -241,6 +241,7 @@ docs/BusyBox.1: docs/busybox.pod
                $< > $@
 
 docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
+       - mkdir -p docs
        -@ rm -f docs/BusyBox.html
        -@ ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
 
@@ -292,15 +293,13 @@ nfsmount.o cmdedit.o: %.o: %.h
 $(OBJECTS): %.o: %.c Config.h busybox.h applets.h Makefile
        $(CC) $(CFLAGS) -I- -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o
 
-$(PWD_OBJS): %.o: %.c pwd_lib_objdir Config.h busybox.h applets.h Makefile
+$(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) $^
 
-pwd_lib_objdir:
-       mkdir -p $(PWD_GRP)
-
 usage.o: usage.h
 
 utility.o: loop.h
@@ -320,7 +319,7 @@ clean:
        - rm -f multibuild.log Config.h.orig
        - rm -rf docs/busybox _install $(PWD_LIB) 
        - rm -f busybox.links loop.h *~ slist.mk core applet_source_list
-       - find -name *.o | xargs rm -f;
+       - find -name \*.o -exec rm -f {} \;
 
 distclean: clean
        - rm -f busybox
@@ -344,17 +343,17 @@ dist release: distclean doc
        find busybox-$(VERSION)/ -type d        \
                                 -name CVS      \
                                 -print         \
-               | xargs rm -rf;                 \
+               -exec rm -rf {} \;              \
                                                \
        find busybox-$(VERSION)/ -type f        \
                                 -name .cvsignore \
                                 -print         \
-               | xargs rm -f;                  \
+               -exec rm -f {}  \;              \
                                                \
        find busybox-$(VERSION)/ -type f        \
                                 -name .\#*     \
                                 -print         \
-               | xargs rm -f;                  \
+               -exec rm -f {} \;               \
                                                \
        tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;