X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=43c2a48b5fb98680f8e455cbd014b4d5cd5433ce;hb=a39342b13183d9a940cc905595eedad140bd3a10;hp=f48fa9da3a259306b4715871258d34eb078b8296;hpb=fb24eb4f47b84a64a1fcc3cee7a6ecba1c7b8e58;p=oweals%2Fbusybox.git

diff --git a/Makefile b/Makefile
index f48fa9da3..43c2a48b5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR).config
 include $(TOPDIR)Rules.mak
 SUBDIRS:=applets archival archival/libunarchive console-tools \
 	editors fileutils findutils init miscutils modutils networking \
-	procps pwd_grp pwd_grp/libpwd_grp shell shellutils sysklogd \
-	textutils util-linux libbb
+	procps loginutils shell shellutils sysklogd \
+	textutils util-linux libbb libpwdgrp
 
 all:    do-it-all
 
@@ -47,7 +47,7 @@ endif
 
 
 busybox: depend $(libraries-y)
-	$(CC) $(LDFLAGS) $(libraries-y) $(LIBRARIES) -o $@
+	$(CC) $(LDFLAGS) -o $@ $(libraries-y) $(LIBRARIES)
 	$(STRIPCMD) $@
 
 busybox.links: applets/busybox.mkll
@@ -159,16 +159,21 @@ $(TOPDIR)include/config.h:
 		make oldconfig; \
 	fi;
 
-menuconfig:
+$(TOPDIR).config:
+	@if [ ! -f $(TOPDIR).config ] ; then \
+	    cp $(TOPDIR)sysdeps/$(TARGET_OS)/defconfig $(TOPDIR).config; \
+	fi;
+
+menuconfig: $(TOPDIR).config
 	mkdir -p $(TOPDIR)include/config
 	$(MAKE) -C scripts/lxdialog all
 	$(BB_SHELL) scripts/Menuconfig sysdeps/$(TARGET_OS)/config.in
 
-config:
+config: $(TOPDIR).config
 	mkdir -p $(TOPDIR)include/config
 	$(BB_SHELL) scripts/Configure sysdeps/$(TARGET_OS)/config.in
 
-oldconfig:
+oldconfig: $(TOPDIR).config
 	mkdir -p $(TOPDIR)include/config
 	$(BB_SHELL) scripts/Configure -d sysdeps/$(TARGET_OS)/config.in
 
@@ -211,15 +216,15 @@ clean:
 	- rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
 	    docs/busybox.net/BusyBox.html
 	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
-	    docs/busybox.pdf docs/busybox.net/busybox.html \
+	    docs/busybox.pdf docs/busybox.pod docs/busybox.net/busybox.html \
 	    docs/busybox _install pod2htm* *.gdb *.elf *~ core
 	- rm -f busybox busybox.links libbb/loop.h .config.old .hdepend
 	- rm -f scripts/split-include scripts/mkdep .*config.log
 	- rm -rf include/config include/config.h
-	- find -name .\*.flags -exec rm -f {} \;   
-	- find -name .depend -exec rm -f {} \;
-	- find -name \*.o -exec rm -f {} \;
-	- find -name \*.a -exec rm -f {} \;
+	- find . -name .\*.flags -exec rm -f {} \;   
+	- find . -name .depend -exec rm -f {} \;
+	- find . -name \*.o -exec rm -f {} \;
+	- find . -name \*.a -exec rm -f {} \;
 
 distclean: clean
 	- rm -f busybox