X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=573f0232719de4a7875510ed65bf6e5f855ed1a4;hb=81fe123040b53490b239b3d2abc8cc93d6d462ae;hp=69ab48ec30557b16d0486f0339dcb501daea5c69;hpb=c9f20d9fb93c6c316518483fd103f3afab5cf1af;p=oweals%2Fbusybox.git

diff --git a/Makefile b/Makefile
index 69ab48ec3..573f02327 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,24 +26,29 @@ noconfig_targets := menuconfig config oldconfig randconfig \
 TOPDIR=./
 include Rules.mak
 
-DIRS:=applets archival archival/libunarchive console-tools debianutils \
-	editors fileutils findutils init miscutils modutils networking \
+DIRS:=applets archival archival/libunarchive coreutils console-tools \
+	debianutils editors findutils init miscutils modutils networking \
 	networking/libiproute networking/udhcp procps loginutils shell \
-	shellutils sysklogd textutils util-linux libbb libpwdgrp
+	sysklogd util-linux libbb libpwdgrp coreutils/libcoreutils
 
-ifdef include_config
+ifeq ($(strip $(CONFIG_SELINUX)),y)
+CFLAGS += -I/usr/include/selinux
+LIBRARIES += -lsecure
+endif
 
-all: busybox busybox.links #doc
+ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
+
+all: busybox busybox.links doc
 
 # In this section, we need .config
 -include .config.cmd
 include $(patsubst %,%/Makefile.in, $(DIRS))
 
-busybox: depend $(libraries-y)
+busybox: .depend include/config.h $(libraries-y)
 	$(CC) $(LDFLAGS) -o $@ $(libraries-y) $(LIBRARIES)
 	$(STRIPCMD) $@
 
-busybox.links: applets/busybox.mkll
+busybox.links: applets/busybox.mkll include/config.h
 	- $(SHELL) $^ >$@
 
 install: applets/install.sh busybox busybox.links
@@ -142,7 +147,7 @@ include/config/MARKER: depend scripts/split-include
 
 include/config.h: .config
 	@if [ ! -x ./scripts/config/conf ] ; then \
-	    make -C scripts/config; \
+	    make -C scripts/config conf; \
 	fi;
 	@./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
 
@@ -154,18 +159,20 @@ finished2:
 	@echo Finished installing...
 	@echo
 
-else # ifdef include_config
+else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 all: menuconfig
 
-ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
-# Targets which don't need .config
-
 # configuration
 # ---------------------------------------------------------------------------
 
-scripts/config/conf scripts/config/mconf:
-	make -C scripts/config
+scripts/config/conf:
+	make -C scripts/config conf
+	-@if [ ! -f .config ] ; then \
+		cp sysdeps/$(TARGET_OS)/defconfig .config; \
+	fi
+scripts/config/mconf:
+	make -C scripts/config ncurses conf mconf
 	-@if [ ! -f .config ] ; then \
 		cp sysdeps/$(TARGET_OS)/defconfig .config; \
 	fi
@@ -201,22 +208,23 @@ check: busybox
 
 clean:
 	- $(MAKE) -C tests clean
-	- $(MAKE) -C scripts/lxdialog 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.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
+	- rm -f .*config.log
 	- 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 scripts/split-include scripts/mkdep
+	- rm -rf include/config include/config.h
+	- find . -name .depend -exec rm -f {} \;
 	rm -f .config .config.old .config.cmd
+	- $(MAKE) -C scripts/config clean
 
 release: distclean #doc
 	cd ..;					\
@@ -239,8 +247,7 @@ tags:
 	ctags -R .
 
 
-endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
-endif # ifdef include_config
+endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
 	menuconfig tags check test tests depend