chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
release 125
[elogind.git] / Makefile
diff --git a/Makefile b/Makefile
index 36b95476017cdd4e9572e273686909dd3befe68e..8b391a01fc5b3fa79d5e088403bc08ca11e0157d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 114
+VERSION = 125
 
 # set this to make use of syslog
 USE_LOG = true
@@ -44,14 +44,8 @@ V =
 
 PROGRAMS = \
        udevd                           \
-       udevtrigger                     \
-       udevsettle                      \
-       udevcontrol                     \
-       udevmonitor                     \
-       udevinfo                        \
-       udevtest                        \
-       test-udev                       \
-       udevstart
+       udevadm                         \
+       test-udev
 
 HEADERS = \
        udev.h                          \
@@ -73,18 +67,19 @@ UDEV_OBJS = \
        udev_utils.o                    \
        udev_utils_string.o             \
        udev_utils_file.o               \
+       udevmonitor.o                   \
+       udevinfo.o                      \
+       udevcontrol.o                   \
+       udevtrigger.o                   \
+       udevsettle.o                    \
+       udevtest.o                      \
        udev_sysdeps.o
 LIBUDEV = libudev.a
 
 MAN_PAGES = \
        udev.7                          \
-       udevmonitor.8                   \
        udevd.8                         \
-       udevtrigger.8                   \
-       udevsettle.8                    \
-       udevtest.8                      \
-       udevinfo.8                      \
-       udevstart.8
+       udevadm.8
 
 GEN_HEADERS = \
        udev_version.h
@@ -93,7 +88,6 @@ prefix ?=
 etcdir =       ${prefix}/etc
 sbindir =      ${prefix}/sbin
 usrbindir =    ${prefix}/usr/bin
-usrsbindir =   ${prefix}/usr/sbin
 libudevdir =   ${prefix}/lib/udev
 mandir =       ${prefix}/usr/share/man
 configdir =    ${etcdir}/udev
@@ -196,9 +190,7 @@ udev_version.h:
        $(E) "  GENHDR  " $@
        $(Q) echo "/* Generated by make. */" > $@
        $(Q) echo \#define UDEV_VERSION         \"$(VERSION)\" >> $@
-       $(Q) echo \#define UDEV_ROOT            \"$(udevdir)\" >> $@
        $(Q) echo \#define UDEV_CONFIG_FILE     \"$(configdir)/udev.conf\" >> $@
-       $(Q) echo \#define UDEV_RULES_DIR       \"$(configdir)/rules.d\" >> $@
 
 # man pages
 %.8 %.7: %.xml
@@ -226,29 +218,23 @@ clean:
 .PHONY: clean
 
 install-config:
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d
        $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
        @ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
-               $(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
+               $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
        fi
-       @ for i in $(shell ls -1 etc/udev/rules.d); do \
-               if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
-                       $(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
-               fi \
-       done
+       cp rules/rules.d/* $(DESTDIR)$(libudevdir)/rules.d
        @ extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: install-config
 
 install-man:
-       $(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7
-       $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
-       $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
-       $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
-       $(INSTALL_DATA) -D udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8
-       $(INSTALL_DATA) -D udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8
-       $(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
-       - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man7
+       $(INSTALL_DATA) udev.7 $(DESTDIR)$(mandir)/man7/udev.7
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+       $(INSTALL_DATA) udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8
        @extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
@@ -256,48 +242,38 @@ install-man:
 
 uninstall-man:
        - rm -f $(DESTDIR)$(mandir)/man7/udev.7
-       - rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8
-       - rm -f $(DESTDIR)$(mandir)/man8/udevtest.8
+       - rm -f $(DESTDIR)$(mandir)/man8/udevadm.8
        - rm -f $(DESTDIR)$(mandir)/man8/udevd.8
-       - rm -f $(DESTDIR)$(mandir)/man8/udevtrigger.8
-       - rm -f $(DESTDIR)$(mandir)/man8/udevsettle.8
-       - rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8
-       - rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
        @ extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: uninstall-man
 
 install-bin:
-       $(INSTALL) -d $(DESTDIR)$(udevdir)
-       $(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
-       $(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
-       $(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle
-       $(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol
-       $(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor
-       $(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
-       $(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
+       $(INSTALL) -d $(DESTDIR)$(sbindir)
+       $(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd
+       $(INSTALL_PROGRAM) udevadm $(DESTDIR)$(sbindir)/udevadm
+       ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle
+       $(INSTALL) -d $(DESTDIR)$(usrbindir)
+       ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo
        @extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
 ifndef DESTDIR
        - killall udevd
-       - rm -rf /dev/.udev
+       - rm -rf $(udevdir)/.udev
        - $(sbindir)/udevd --daemon
 endif
 .PHONY: install-bin
 
 uninstall-bin:
        - rm -f $(DESTDIR)$(sbindir)/udevd
-       - rm -f $(DESTDIR)$(sbindir)/udevtrigger
+       - rm -f $(DESTDIR)$(sbindir)/udevadm
        - rm -f $(DESTDIR)$(sbindir)/udevsettle
-       - rm -f $(DESTDIR)$(sbindir)/udevcontrol
-       - rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
        - rm -f $(DESTDIR)$(usrbindir)/udevinfo
-       - rm -f $(DESTDIR)$(usrbindir)/udevtest
 ifndef DESTDIR
        - killall udevd
-       - rm -rf /dev/.udev
+       - rm -rf $(udevdir)/.udev
 endif
        @extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
@@ -312,7 +288,6 @@ uninstall: uninstall-bin uninstall-man
 
 test tests: all
        @ cd test && ./udev-test.pl
-       @ cd test && ./udevstart-test.pl
 .PHONY: test tests
 
 buildtest:
Unnamed repository; edit this file 'description' to name the repository.