X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=75964bab31d64666ac2eca8bfdbe5c82b0dfd562;hb=d7881b0ed5ed3fc31fac1545413bca441ac239f6;hp=9e7d8f08684ecd6876d2d17175615145e6864cca;hpb=59d6ed3f0179d35fd5fc27c87018906df1142d08;p=thirdparty%2Futil-linux.git

diff --git a/Makefile.am b/Makefile.am
index 9e7d8f0868..75964bab31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,16 @@ AM_CPPFLAGS = \
 	-include config.h \
 	-I$(top_srcdir)/include \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-D_PATH_LOCALSTATEDIR=\"${localstatedir}\"
+	-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 =
+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.
@@ -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 =
@@ -48,7 +53,6 @@ systemdsystemunit_DATA =
 dist_bashcompletion_DATA =
 check_PROGRAMS =
 dist_check_SCRIPTS =
-TESTS =
 
 PATHFILES =
 
@@ -73,10 +77,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
@@ -97,6 +100,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,8 +123,9 @@ 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|@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' \
@@ -132,12 +144,30 @@ 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)
 
 $(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
@@ -148,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
@@ -174,10 +204,33 @@ 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 \
 	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
@@ -205,6 +258,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)