build-sys: drop shlibs/Makefile.am that only adds SUBDIRS

The same effect is gotten by changing SUBDIRS in the top-level
Makefile.am.

diff --git a/Makefile.am b/Makefile.am
index f332510a3a9f7ff88bc2f1bf114be3bae019489a..c489665f5b532c8ee1e77cba57897b76a48cfaed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,26 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+SHLIBS_DIRS =
+
+if BUILD_LIBUUID
+SHLIBS_DIRS += shlibs/uuid
+endif
+
+if BUILD_LIBBLKID
+SHLIBS_DIRS += shlibs/blkid
+endif
+
+if BUILD_LIBMOUNT
+SHLIBS_DIRS += shlibs/mount
+endif
+
 SUBDIRS = \
        include \
        disk-utils \
        fdisk \
        getopt \
        lib \
-       shlibs \
+       $(SHLIBS_DIRS) \
        login-utils \
        misc-utils \
        po \

diff --git a/configure.ac b/configure.ac
index 1d81f2074db973fa9ff3084fd661385721037b89..eaa5945f57f87e6f842edf8b23cce6b7b4a43775 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1168,7 +1168,6 @@ shlibs/uuid/uuid.pc
 shlibs/uuid/Makefile
 shlibs/uuid/man/Makefile
 shlibs/uuid/src/Makefile
-shlibs/Makefile
 sys-utils/Makefile
 tests/commands.sh
 tests/helpers/Makefile

diff --git a/shlibs/Makefile.am b/shlibs/Makefile.am
deleted file mode 100644 (file)
index 84c0cef..0000000
--- a/shlibs/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS =
-
-if BUILD_LIBUUID
-SUBDIRS += uuid
-endif
-
-if BUILD_LIBBLKID
-SUBDIRS += blkid
-endif
-
-if BUILD_LIBMOUNT
-SUBDIRS += mount
-endif