diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-06 19:34:41 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-06 19:34:41 -0400 |
| commit | 7caf4c9257500c4002330dae87f93230768561bd (patch) | |
| tree | 54e34f2ca5f1be76198d638a2aedbec559c26b37 | |
| parent | 7e231e18693f43a3fff32b871402d1e7eb4fa46e (diff) | |
| parent | e535e70c2d06cc6eb1c894e1b355cbeb0eb5b4c6 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libudev/Makefile
# src/libudev/src/Makefile
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | discard.mk | 23 |
2 files changed, 26 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 8b8ed97cd0..d7c16eb33f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6366,7 +6366,7 @@ hwdb-update: wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \ ./ids-update.pl ) -#@Makefile +#@discard.mk .PHONY: built-sources built-sources: $(BUILT_SOURCES) @@ -6469,7 +6469,7 @@ test-libsystemd-sym.c: \ src/systemd/sd-event.h $(generate-sym-test) -#@src/libudev/Makefile +#@src/libudev/src/Makefile test-libudev-sym.c: \ src/libudev/libudev.sym \ src/udev/udev.h @@ -6481,7 +6481,7 @@ nodist_test_libsystemd_sym_SOURCES = \ test_libsystemd_sym_LDADD = \ libsystemd.la -#@src/libudev/Makefile +#@src/libudev/src/Makefile nodist_test_libudev_sym_SOURCES = \ test-libudev-sym.c test_libudev_sym_CFLAGS = \ diff --git a/discard.mk b/discard.mk index 26bd1fb32a..4f966ae4b3 100644 --- a/discard.mk +++ b/discard.mk @@ -1124,6 +1124,29 @@ dist-check-help: $(bin_PROGRAMS) $(bin_PROGRAMS) exit 1; \ fi; done +.PHONY: built-sources +built-sources: $(BUILT_SOURCES) + +.PHONY: git-tag +git-tag: + git tag -s "v$(VERSION)" -m "systemd $(VERSION)" + +.PHONY: git-tar +git-tar: + git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz + +www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd + +.PHONY: doc-sync +doc-sync: all + rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ + +.PHONY: install-tree +install-tree: all + rm -rf $(abs_srcdir)/install-tree + $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree + tree $(abs_srcdir)/install-tree + BUILT_SOURCES += \ test-libsystemd-sym.c \ test-libudev-sym.c |