There's no point into requiring 1.9 if the gtk-doc makefiles only work
with 1.10.
Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx>
---
Makefile.am | 16 +++++++++++++++-
configure.ac | 3 +--
shlibs/Makefile.am | 13 -------------
3 files changed, 16 insertions(+), 16 deletions(-)
delete mode 100644 shlibs/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f332510..c489665 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 8c5f92f..657ebe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.60)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([check-news -Wall foreign 1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([check-news -Wall foreign 1.10 dist-bzip2])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
@@ -1167,7 +1167,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 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
--
1.7.1.1
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
