applying:

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 4dbd9aa8ceff1c51301766daebfcf5aafbd2b6d3..d205bb1b6b35a5a3d0bc2f577fdceac422c663e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 #--------------------------------------------------------------
 noconfig_targets := menuconfig config oldconfig randconfig \
        defconfig allyesconfig allnoconfig clean distclean \
-       release tags  
+       release tags
 
 ifndef TOPDIR
 TOPDIR=$(CURDIR)/
@@ -42,13 +42,12 @@ include $(top_builddir)/Rules.mak
 DIRS:=applets archival archival/libunarchive coreutils console-tools \
        debianutils editors findutils init miscutils modutils networking \
        networking/libiproute networking/udhcp procps loginutils shell \
-       sysklogd util-linux libpwdgrp coreutils/libcoreutils libbb
+       sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb
 
 SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
 
 ifeq ($(strip $(CONFIG_SELINUX)),y)
-CFLAGS += -I/usr/include/selinux
-LIBRARIES += -lsecure
+LIBRARIES += -lselinux
 endif
 
 CONFIG_CONFIG_IN = $(top_srcdir)/sysdeps/$(TARGET_OS)/Config.in
@@ -147,7 +146,7 @@ uninstall: busybox.links
        rm -f $(PREFIX)/bin/busybox
        for i in `cat busybox.links` ; do rm -f $(PREFIX)$$i; done
 
-install-hardlinks: applets/install.sh busybox busybox.links
+install-hardlinks: $(top_srcdir)/applets/install.sh busybox busybox.links
        $(SHELL) $< $(PREFIX) --hardlinks
 
 check: busybox
@@ -193,7 +192,7 @@ scripts/mkdep: $(top_srcdir)/scripts/mkdep.c
 scripts/split-include: $(top_srcdir)/scripts/split-include.c
        $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 
-.depend: scripts/mkdep
+.depend: scripts/mkdep include/config.h
        rm -f .depend .hdepend;
        mkdir -p include/config;
        scripts/mkdep -I include -- \
@@ -201,7 +200,7 @@ scripts/split-include: $(top_srcdir)/scripts/split-include.c
        scripts/mkdep -I include -- \
          `find $(top_srcdir) -name \*.h -print | sed -e "s,^./,,"` >> .hdepend;
 
-depend dep: include/config.h .depend
+depend dep: .depend
 
 include/config/MARKER: depend scripts/split-include
        scripts/split-include include/config.h include/config