libmount: don't use sscanf() for swaps parsing

[thirdparty/util-linux.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 758c4f2859e192a6ab62a72b30c3a30fef88c9cc..e7657afe91c95fcd3536472a706a4db1c72b0b19 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = \
        -include config.h \
        -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\" \
-       -D_PATH_LOCALSTATEDIR=\"${localstatedir}\"
+       -D_PATH_RUNSTATEDIR=\"${runstatedir}\"
 AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
 AM_LDFLAGS =
 
@@ -72,10 +72,9 @@ EXTRA_DIST += \
        autogen.sh \
        Documentation \
        po/update-potfiles \
-       README.licensing \
-       tools/git-version-gen
-
+       README.licensing
 
+include tools/Makemodule.am
 include include/Makemodule.am
 include lib/Makemodule.am
 include libuuid/Makemodule.am
@@ -96,6 +95,14 @@ include bash-completion/Makemodule.am
 
 include tests/Makemodule.am
 
+# pylibmountexec module must be installed after usrlib_exec libraries,
+# otherwise the libtool relink step will fail to find libmount.la and
+# will try -lmount which is possibly not available.
+#
+# So introduce this dependency rule:
+# install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES
+@verbatim_pylibmount_dependency@
+
 #
 # Don't rely on configure.ac AC_CONFIG_FILES for install paths.
 #
@@ -112,7 +119,7 @@ edit_cmd = sed \
         -e 's|@sbindir[@]|$(sbindir)|g' \
         -e 's|@bindir[@]|$(bindir)|g' \
         -e 's|@includedir[@]|$(includedir)|g' \
-        -e 's|@localstatedir[@]|$(localstatedir)|g' \
+        -e 's|@runstatedir[@]|$(runstatedir)|g' \
         -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
         -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
         -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
@@ -136,7 +143,7 @@ EXTRA_DIST += $(PATHFILES:=.in)
 
 $(PATHFILES): Makefile
        @ rm -f $@ $@.tmp
-       $(AM_V_at) test -d $(dir $@) || mkdir -p $(dir $@)
+       $(AM_V_at) $(MKDIR_P) $$(dirname $@)
        $(AM_V_GEN) srcdir=''; \
                test -f ./$@.in || srcdir=$(srcdir)/; \
                $(edit_cmd) $${srcdir}$@.in >$@.tmp
@@ -173,10 +180,19 @@ checkxalloc:
 checkdecl:
        @ $(top_srcdir)/tools/checkdecl.sh
 
+checkcompletion:
+       @ $(top_srcdir)/tools/checkcompletion.sh $(top_srcdir)
+
+checkusage:
+       @ $(top_srcdir)/tools/checkusage.sh \
+               $(bin_PROGRAMS) $(sbin_PROGRAMS) \
+               $(usrbin_exec_PROGRAMS) $(usrsbin_exec_PROGRAMS)
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --disable-use-tty-group \
        --disable-silent-rules \
        --enable-all-programs \
+       --disable-makeinstall-chown \
        --enable-static-programs \
        --enable-gtk-doc \
        --with-python \