[systemd-commits] 2 commits - Makefile.am

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am |   24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 9f70075586839e8f1c097874fea2223a3d76230c
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sun Jan 26 11:36:04 2014 -0500

    build-sys: expose more phony targets

diff --git a/Makefile.am b/Makefile.am
index 0b891a7..23f7d2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,6 +145,10 @@ TESTS =
 endif
 udevlibexec_PROGRAMS =
 
+.PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \
+	$(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
+	$(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
+
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
@@ -558,7 +562,7 @@ MANPAGES_ALIAS =
 
 include Makefile-man.am
 
-.PHONY: man
+.PHONY: man update-man-list
 man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
 
 XML_FILES = \
@@ -1415,7 +1419,7 @@ test_sched_prio_LDADD = \
 
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
-.PHONY: coverage lcov-run lcov-report
+.PHONY: coverage lcov-run lcov-report coverage-sync
 
 # run lcov from scratch, always
 coverage:
@@ -3797,7 +3801,7 @@ dist_noinst_SCRIPT = \
 	src/locale/generate-kbd-model-map
 
 update-kbd-model-map: src/locale/generate-kbd-model-map
-	$PYTHON $< > src/locale/kbd-model-map
+	$PYTHON $< >src/locale/kbd-model-map
 
 localectl_SOURCES = \
 	src/locale/localectl.c
@@ -3818,6 +3822,8 @@ dist_zshcompletion_DATA += \
 
 endif
 
+.PHONY: update-kbd-model-map
+
 polkitpolicy_in_files += \
 	src/locale/org.freedesktop.locale1.policy.in
 
@@ -4427,6 +4433,8 @@ endif
 
 CLEAN_LOCAL_HOOKS += clean-sphinx
 
+.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
+
 clean-sphinx:
 	-rm -rf docs/html/python-systemd/
 
@@ -4836,6 +4844,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc
 endif
 
+.PHONY: hwdb-update
 hwdb-update:
 	( cd $(top_srcdir)/hwdb && \
 	wget -N http://www.linux-usb.org/usb.ids \
@@ -4844,16 +4853,19 @@ hwdb-update:
 	        http://standards.ieee.org/develop/regauth/iab/iab.txt && \
 	./ids-update.pl )
 
+.PHONY: kdbus-update
 kdbus-update:
 	( cd $(top_srcdir)/src/libsystemd/ && \
 	wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
+.PHONY: upload
 upload: all distcheck
 	cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
 	scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
 	scp man/*.html tango:public/systemd-man/
 
 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
+.PHONY: doc-sync
 doc-sync: all destdir-sphinx
 	gtkdoc-rebase --html-dir=docs/libudev/html --online
 	rsync -rlv --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/
@@ -4862,9 +4874,11 @@ doc-sync: all destdir-sphinx
 	rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 	rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
+.PHONY: git-tag
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"
 
+.PHONY: install-tree
 install-tree: all
 	rm -rf $(abs_srcdir)/install-tree
 	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
@@ -4872,6 +4886,7 @@ install-tree: all
 
 # Let's run all tests of the test suite, but under valgrind. Let's
 # exclude the one perl script we have in there
+.PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
 	$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
 		if file $$f | grep -q shell; then \
@@ -4887,6 +4902,7 @@ exported-%: %
 exported: $(addprefix exported-, $(lib_LTLIBRARIES))
 	$(AM_V_GEN)cat $^ > $@
 
+.PHONY: check-api-docs
 check-api-docs: exported man
 	$(AM_V_GEN)for symbol in `cat exported` ; do \
 		if test -f $(builddir)/man/$$symbol.html ; then \
@@ -4908,6 +4924,7 @@ CLEANFILES += \
 	defined \
 	undefined
 
+.PHONY: check-api-unused
 check-api-unused: defined undefined exported
 	( cat exported undefined ) | sort -u  | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-
 

commit bd390ae7c75dc5bb0e151e6fd2f7156998ed710f
Author: Elia Pinto <devzero2000 at rpm5.org>
Date:   Wed Jan 22 03:28:43 2014 -0800

    build-sys: add a phony target for cppcheck
    
    The cppcheck target was introduced by commit 16f4efb4150c65e3c61adaa8ea512489de49f532
    "build-sys: add cppcheck target". But it is preferable to use a make phony target
    for it, as this patch does.
    
    There are two general reasons to use a phony target: to avoid a
    conflict with a file of the same name, and to improve performance. In
    this case the first reason is obvious, and the second is that make
    skips the implicit rule search for phony targets, since it knows that
    phony targets do not name actual files that could be remade from other
    files (as described in the "Gnu Make" Manual).

diff --git a/Makefile.am b/Makefile.am
index 37073d2..0b891a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5008,6 +5008,7 @@ tests += \
 	test-libsystemd-id128-sym
 endif
 
+.PHONY: cppcheck
 cppcheck:
 	cppcheck --enable=all -q $(top_srcdir)