dmesg: add --follow-new

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

diff --git a/Makefile.am b/Makefile.am
index 0ae085d9a953ce3f5f0d3e260b435ed081bfd240..75964bab31d64666ac2eca8bfdbe5c82b0dfd562 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,14 @@ AM_CPPFLAGS = \
        -include config.h \
        -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\" \
-       -D_PATH_RUNSTATEDIR=\"${runstatedir}\"
+       -D_PATH_RUNSTATEDIR=\"${runstatedir}\" \
+       -D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\"
+
+if USE_VENDORDIR
+AM_CPPFLAGS += \
+       -D_PATH_VENDORDIR=\"${vendordir}\"
+endif
+
 AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
 AM_LDFLAGS = $(ASAN_LDFLAGS)
 
@@ -28,8 +35,6 @@ ul_libfdisk_incdir  = $(top_builddir)/libfdisk/src
 
 ul_libuuid_incdir  = $(top_srcdir)/libuuid/src
 
-pkgconfigdir = $(usrlib_execdir)/pkgconfig
-
 bashcompletiondir = @bashcompletiondir@
 
 dist_noinst_HEADERS =
@@ -118,6 +123,7 @@ edit_cmd = sed \
         -e 's|@datadir[@]|$(datadir)|g' \
         -e 's|@sbindir[@]|$(sbindir)|g' \
         -e 's|@bindir[@]|$(bindir)|g' \
+        -e 's|@docdir[@]|$(docdir)|g' \
         -e 's|@includedir[@]|$(includedir)|g' \
         -e 's|@runstatedir[@]|$(runstatedir)|g' \
         -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
@@ -138,6 +144,24 @@ edit_cmd = sed \
         -e 's|@LIBFDISK_PATCH_VERSION[@]|$(LIBFDISK_PATCH_VERSION)|g' \
         -e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g'
 
+if HAVE_SELINUX
+edit_cmd += -e 's|@LIBSELINUX[@]|libselinux|g'
+else
+edit_cmd += -e 's|@LIBSELINUX[@]||g'
+endif
+
+if HAVE_CRYPTSETUP
+edit_cmd += -e 's|@LIBCRYPTSETUP[@]|libcryptsetup|g'
+else
+edit_cmd += -e 's|@LIBCRYPTSETUP[@]||g'
+endif
+
+if USE_VENDORDIR
+edit_cmd += -e 's|@vendordir[@]|$(vendordir)|g'
+else
+edit_cmd += -e 's|@vendordir[@]||g'
+endif
+
 CLEANFILES += $(PATHFILES)
 EXTRA_DIST += $(PATHFILES:=.in)
 
@@ -154,7 +178,7 @@ $(PATHFILES): Makefile
 dist-hook:
        echo $(VERSION) > $(distdir)/.tarball-version
 # Set ChangeLog tag reference.
-       sed -i "s/log/log;h=$(VERSION)/" $(distdir)/ChangeLog
+       sed -i "s!log!log?h=v$(VERSION)!" $(distdir)/ChangeLog
 
 distclean-local:
        -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f
@@ -187,6 +211,19 @@ 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 \