Remove BB_FEATURE_REMOUNT (small, and should always be present)

and fix documentation dependancy checks, so it is only built when
it should be built.
 -Erik

diff --git a/Makefile b/Makefile
index fc0396eec8f86d62ffff607c2c489aa750ea78a5..424218cfa682d91ffb5ee23e786f186b0ff1b52b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,12 +99,28 @@ ifdef BB_INIT_SCRIPT
     CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
 endif
 
-all: busybox busybox.links
+all: busybox busybox.links doc
+
+doc: BusyBox.txt BusyBox.1 BusyBox.html
+
+BusyBox.txt: docs/busybox.pod
+       @echo
+       @echo BusyBox Documentation
+       @echo
+       pod2text docs/busybox.pod > BusyBox.txt
+
+BusyBox.1: docs/busybox.pod
+       pod2man --center=BusyBox --release="version $(VERSION)" docs/busybox.pod > BusyBox.1
+
+BusyBox.html: docs/busybox.pod
+       pod2html docs/busybox.pod > BusyBox.html
+       - rm -f pod2html*
+
+clean:
 
 busybox: $(OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
        $(STRIP)
-       ( cd docs ; $(MAKE) )
 
 busybox.links: busybox.def.h
        - ./busybox.mkll | sort >$@
@@ -119,6 +135,7 @@ clean:
        - rm -f busybox.links *~ *.o core
        - rm -rf _install
        - cd tests && $(MAKE) clean
+       - rm -f BusyBox.html BusyBox.1 BusyBox.txt pod2html*
 
 distclean: clean
        - rm -f busybox
@@ -127,8 +144,7 @@ distclean: clean
 install: busybox busybox.links
        ./install.sh $(PREFIX)
 
-dist release: distclean
-       ( cd docs ; $(MAKE) )
+dist release: distclean doc
        cd ..;                                  \
        rm -rf busybox-$(VERSION);              \
        cp -a busybox busybox-$(VERSION);       \

diff --git a/busybox.def.h b/busybox.def.h
index 5187bc5060477878286bfe00d2fb036d72d1ecaf..c5b7de900cf00121a4ab3d647cc75dfee45fa77d 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -181,9 +181,6 @@
 // Enable support for a real /etc/mtab file instead of /proc/mounts
 //#define BB_FEATURE_MOUNT_MTAB_SUPPORT
 //
-// Enable support for remounting filesystems
-#define BB_FEATURE_REMOUNT
-//
 // Enable support for mounting remote NFS volumes
 //#define BB_FEATURE_NFSMOUNT
 //
@@ -236,12 +233,6 @@
 #endif
 #endif
 //
-#ifdef BB_INIT
-#ifndef BB_FEATURE_REMOUNT
-#define BB_FEATURE_REMOUNT
-#endif
-#endif
-//
 #ifdef BB_FEATURE_LINUXRC
 #ifndef BB_INIT
 #define BB_INIT

diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644 (file)
index 472d29e..0000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# busybox/docs/Makefile - Create the documentation
-# ------------------------
-# Copyright (C) 2000  Erik Andersen <andersee@debian.org>  GPL
-
-all: clean doc
-
-doc:
-       @echo
-       @echo BusyBox Documentation
-       @echo
-       pod2html busybox.pod > ../BusyBox.html 
-       @rm pod2html-*
-       pod2man --center=BusyBox --release="version $(VERSION)" busybox.pod > ../BusyBox.1
-       pod2text busybox.pod > ../BusyBox.txt
-       @rm -f pod2html*
-
-clean:
-       @rm -f ../BusyBox.html ../BusyBox.1 ../BusyBox.txt pod2html*
-
-distclean: clean
-

diff --git a/umount.c b/umount.c
index 92eb0a61a05c16d09b0d6620fe5c46f4c2631747..ad7de2d20eb13f59f35a2b7a3c424e2962abc449 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -37,9 +37,7 @@ static const char umount_usage[] =
 #else
        "\n"
 #endif
-#ifdef BB_FEATURE_REMOUNT
        "\t-r:\tTry to remount devices as read-only if mount is busy\n"
-#endif
 #if defined BB_FEATURE_MOUNT_LOOP
        "\t-f:\tDo not free loop device (if a loop device has been used)\n"
 #endif
@@ -60,9 +58,7 @@ static int freeLoop = TRUE;
 #endif
 static int useMtab = TRUE;
 static int umountAll = FALSE;
-#if defined BB_FEATURE_REMOUNT
 static int doRemount = FALSE;
-#endif
 extern const char mtab_file[]; /* Defined in utility.c */
 
 
@@ -180,7 +176,6 @@ static int do_umount(const char *name, int useMtab)
                /* this was a loop device, delete it */
                del_loop(blockDevice);
 #endif
-#if defined BB_FEATURE_REMOUNT
        if (status != 0 && doRemount == TRUE && errno == EBUSY) {
                status = mount(blockDevice, name, NULL,
                                           MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
@@ -193,7 +188,6 @@ static int do_umount(const char *name, int useMtab)
                                        blockDevice);
                }
        }
-#endif
        if (status == 0) {
 #if defined BB_MTAB
                if (useMtab == TRUE)
@@ -255,11 +249,9 @@ extern int umount_main(int argc, char **argv)
                                useMtab = FALSE;
                                break;
 #endif
-#ifdef BB_FEATURE_REMOUNT
                        case 'r':
                                doRemount = TRUE;
                                break;
-#endif
                        case 'v':
                                break; /* ignore -v */
                        default:

diff --git a/util-linux/umount.c b/util-linux/umount.c
index 92eb0a61a05c16d09b0d6620fe5c46f4c2631747..ad7de2d20eb13f59f35a2b7a3c424e2962abc449 100644 (file)
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -37,9 +37,7 @@ static const char umount_usage[] =
 #else
        "\n"
 #endif
-#ifdef BB_FEATURE_REMOUNT
        "\t-r:\tTry to remount devices as read-only if mount is busy\n"
-#endif
 #if defined BB_FEATURE_MOUNT_LOOP
        "\t-f:\tDo not free loop device (if a loop device has been used)\n"
 #endif
@@ -60,9 +58,7 @@ static int freeLoop = TRUE;
 #endif
 static int useMtab = TRUE;
 static int umountAll = FALSE;
-#if defined BB_FEATURE_REMOUNT
 static int doRemount = FALSE;
-#endif
 extern const char mtab_file[]; /* Defined in utility.c */
 
 
@@ -180,7 +176,6 @@ static int do_umount(const char *name, int useMtab)
                /* this was a loop device, delete it */
                del_loop(blockDevice);
 #endif
-#if defined BB_FEATURE_REMOUNT
        if (status != 0 && doRemount == TRUE && errno == EBUSY) {
                status = mount(blockDevice, name, NULL,
                                           MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
@@ -193,7 +188,6 @@ static int do_umount(const char *name, int useMtab)
                                        blockDevice);
                }
        }
-#endif
        if (status == 0) {
 #if defined BB_MTAB
                if (useMtab == TRUE)
@@ -255,11 +249,9 @@ extern int umount_main(int argc, char **argv)
                                useMtab = FALSE;
                                break;
 #endif
-#ifdef BB_FEATURE_REMOUNT
                        case 'r':
                                doRemount = TRUE;
                                break;
-#endif
                        case 'v':
                                break; /* ignore -v */
                        default: