libmount: fix comment referring to passno field

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

diff --git a/Makefile.am b/Makefile.am
index 79b5aea782bf412609e4187b50001d471c13665a..51c6499097b58d78ad8fc5e3b3e902206dced5e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ 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 =
+AM_LDFLAGS = $(ASAN_LDFLAGS)
 
 # Add gettext stuff to the global LDADD for systems with separate libintl
 # library. The LTLIBINTL is generated by AM_GNU_GETTEXT macro.
@@ -18,16 +18,15 @@ LDADD = $(LTLIBINTL)
 dist_noinst_DATA = $(dist_man_MANS)
 
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) Note
-# that blkid.h, libmount.h and libsmartcols.h are generated and stored in build
-# dirs.
+# that blkid.h, libmount.h, libfdisk.h and libsmartcols.h are generated and
+# stored in build dirs.
 #
 ul_libblkid_incdir = $(top_builddir)/libblkid/src
 ul_libmount_incdir = $(top_builddir)/libmount/src
 ul_libsmartcols_incdir = $(top_builddir)/libsmartcols/src
-ul_libuuid_incdir  = $(top_srcdir)/libuuid/src
-ul_libfdisk_incdir  = $(top_srcdir)/libfdisk/src
+ul_libfdisk_incdir  = $(top_builddir)/libfdisk/src
 
-pkgconfigdir = $(usrlib_execdir)/pkgconfig
+ul_libuuid_incdir  = $(top_srcdir)/libuuid/src
 
 bashcompletiondir = @bashcompletiondir@
 
@@ -47,7 +46,6 @@ systemdsystemunit_DATA =
 dist_bashcompletion_DATA =
 check_PROGRAMS =
 dist_check_SCRIPTS =
-TESTS =
 
 PATHFILES =
 
@@ -72,10 +70,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 +93,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 +117,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' \
@@ -120,7 +125,15 @@ edit_cmd = sed \
         -e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \
         -e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \
         -e 's|@LIBMOUNT_VERSION[@]|$(LIBMOUNT_VERSION)|g' \
+        -e 's|@LIBMOUNT_MAJOR_VERSION[@]|$(LIBMOUNT_MAJOR_VERSION)|g' \
+        -e 's|@LIBMOUNT_MINOR_VERSION[@]|$(LIBMOUNT_MINOR_VERSION)|g' \
+        -e 's|@LIBMOUNT_PATCH_VERSION[@]|$(LIBMOUNT_PATCH_VERSION)|g' \
         -e 's|@LIBSMARTCOLS_VERSION[@]|$(LIBSMARTCOLS_VERSION)|g' \
+        -e 's|@LIBFDISK_PC_REQUIRES[@]|$(LIBFDISK_PC_REQUIRES)|g' \
+        -e 's|@LIBFDISK_VERSION[@]|$(LIBFDISK_VERSION)|g' \
+        -e 's|@LIBFDISK_MAJOR_VERSION[@]|$(LIBFDISK_MAJOR_VERSION)|g' \
+        -e 's|@LIBFDISK_MINOR_VERSION[@]|$(LIBFDISK_MINOR_VERSION)|g' \
+        -e 's|@LIBFDISK_PATCH_VERSION[@]|$(LIBFDISK_PATCH_VERSION)|g' \
         -e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g'
 
 CLEANFILES += $(PATHFILES)
@@ -128,6 +141,7 @@ EXTRA_DIST += $(PATHFILES:=.in)
 
 $(PATHFILES): Makefile
        @ rm -f $@ $@.tmp
+       $(AM_V_at) $(MKDIR_P) $$(dirname $@)
        $(AM_V_GEN) srcdir=''; \
                test -f ./$@.in || srcdir=$(srcdir)/; \
                $(edit_cmd) $${srcdir}$@.in >$@.tmp
@@ -164,10 +178,32 @@ 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)
+checklibdoc:
+       @ $(top_srcdir)/tools/checklibdocs.sh \
+               $(top_srcdir)/libmount/src/libmount.sym \
+               $(top_srcdir)/libmount/docs/libmount-sections.txt
+       @ $(top_srcdir)/tools/checklibdocs.sh \
+               $(top_srcdir)/libfdisk/src/libfdisk.sym \
+               $(top_srcdir)/libfdisk/docs/libfdisk-sections.txt
+       @ $(top_srcdir)/tools/checklibdocs.sh \
+               $(top_srcdir)/libsmartcols/src/libsmartcols.sym \
+               $(top_srcdir)/libsmartcols/docs/libsmartcols-sections.txt
+       @ $(top_srcdir)/tools/checklibdocs.sh \
+               $(top_srcdir)/libblkid/src/libblkid.sym \
+               $(top_srcdir)/libblkid/docs/libblkid-sections.txt
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --disable-use-tty-group \
        --disable-silent-rules \
        --enable-all-programs \
+       --disable-makeinstall-chown \
        --enable-static-programs \
        --enable-gtk-doc \
        --with-python \
@@ -196,6 +232,8 @@ $(CHANGELOG_FILE):
 checksmatch:
        $(MAKE) CHECK="smatch --data=$(abs_top_srcdir)/tools/smatch-data" CC=cgcc
 
+check-programs: $(check_PROGRAMS)
+
 changelog: $(CHANGELOG_FILE)
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)