From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Wed, 28 Jul 2010 20:40:04 +0000 (+0200)
Subject: build-sys: drop shlibs/Makefile.am that only adds SUBDIRS
X-Git-Tag: v2.19-rc1~392
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebc83db1a1d123a74da7e8bd07b281ab17e18ed6;p=thirdparty%2Futil-linux.git

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 f332510a3a..c489665f5b 100644
--- 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 1d81f2074d..eaa5945f57 100644
--- 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
index 84c0cefc82..0000000000
--- 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