diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | discard.mk | 23 | ||||
| -rw-r--r-- | src/libudev/Makefile | 40 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 13 |
4 files changed, 39 insertions, 43 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 diff --git a/src/libudev/Makefile b/src/libudev/Makefile deleted file mode 100644 index fb53230e1b..0000000000 --- a/src/libudev/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk -include $(topsrcdir)/build-aux/Makefile.head.mk - -test-libudev-sym.c: \ - src/libudev/libudev.sym \ - src/udev/udev.h - $(generate-sym-test) - -nodist_test_libudev_sym_SOURCES = \ - test-libudev-sym.c -test_libudev_sym_CFLAGS = \ - $(AM_CFLAGS) \ - -Wno-deprecated-declarations -test_libudev_sym_LDADD = \ - libudev.la - -$(eval $(value automake2autothing)) -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 6023c574a1..1dd575021c 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -61,5 +61,18 @@ pkgconfiglib_DATA += \ EXTRA_DIST += \ src/libudev/libudev.pc.in +test-libudev-sym.c: \ + src/libudev/libudev.sym \ + src/udev/udev.h + $(generate-sym-test) + +nodist_test_libudev_sym_SOURCES = \ + test-libudev-sym.c +test_libudev_sym_CFLAGS = \ + $(AM_CFLAGS) \ + -Wno-deprecated-declarations +test_libudev_sym_LDADD = \ + libudev.la + $(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk |