Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 11 +++++++++++ config/include-Makefile.am | 11 ----------- config/include-sub-Makefile.am | 10 ---------- shlibs/blkid/docs/Makefile.am | 2 +- shlibs/mount/docs/Makefile.am | 2 +- 5 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 config/include-sub-Makefile.am diff --git a/Makefile.am b/Makefile.am index c6734f5..bef46f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,16 @@ include $(top_srcdir)/config/include-Makefile.am +AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \ + -DLOCALEDIR=\"$(localedir)\" +AM_CFLAGS = -fsigned-char +AM_LDFLAGS = + +# Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals. +# Unlike with other dist primaries, the files are not distributed if the +# conditional is false. +# Work the bug around until it is fixed: +dist_noinst_DATA = $(dist_man_MANS) + INSTALL_EXEC_HOOKS = UNINSTALL_HOOKS = INSTALL_DATA_HOOKS = diff --git a/config/include-Makefile.am b/config/include-Makefile.am index a186bda..a33c96f 100644 --- a/config/include-Makefile.am +++ b/config/include-Makefile.am @@ -1,14 +1,3 @@ -AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \ - -DLOCALEDIR=\"$(localedir)\" -AM_CFLAGS = -fsigned-char -AM_LDFLAGS = - -# Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals. -# Unlike with other dist primaries, the files are not distributed if the -# conditional is false. -# Work the bug around until it is fixed: -dist_noinst_DATA = $(dist_man_MANS) - # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) # # blkid diff --git a/config/include-sub-Makefile.am b/config/include-sub-Makefile.am deleted file mode 100644 index 0444977..0000000 --- a/config/include-sub-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -$(ul_libblkid_la): - $(MAKE) -C $(top_builddir) $(ul_libblkid_la) - -$(ul_libmount_la): - $(MAKE) -C $(top_builddir) $(ul_libmount_la) - -$(ul_libuuid_la): - $(MAKE) -C $(top_builddir) $(ul_libuuid_la) diff --git a/shlibs/blkid/docs/Makefile.am b/shlibs/blkid/docs/Makefile.am index c34d2a5..8ef3b23 100644 --- a/shlibs/blkid/docs/Makefile.am +++ b/shlibs/blkid/docs/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-sub-Makefile.am +include $(top_srcdir)/config/include-Makefile.am ## Process this file with automake to produce Makefile.in diff --git a/shlibs/mount/docs/Makefile.am b/shlibs/mount/docs/Makefile.am index 0b1e5c5..13e1c65 100644 --- a/shlibs/mount/docs/Makefile.am +++ b/shlibs/mount/docs/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-sub-Makefile.am +include $(top_srcdir)/config/include-Makefile.am ## Process this file with automake to produce Makefile.in -- 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
