Merge pull request #3638 from whot/udev-prop-touchpad-integration

tag touchpads as internal/external

diff --combined Makefile.am
index f71ce848eec09ce22d98a1aae84d56de4414ebfd,e3a350578b07f118b4f7cf9789cd54f04ce227eb..c9fb4917ad43219f6311aa7d099d5e0888408420
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -3667,6 -3667,7 +3667,7 @@@ dist_udevrules_DATA += 
        rules/60-serial.rules \
        rules/64-btrfs.rules \
        rules/70-mouse.rules \
+       rules/70-touchpad.rules \
        rules/75-net-description.rules \
        rules/78-sound-card.rules \
        rules/80-net-setup-link.rules
@@@ -3833,7 -3834,8 +3834,8 @@@ dist_udevhwdb_DATA = 
        hwdb/60-evdev.hwdb \
        hwdb/60-keyboard.hwdb \
        hwdb/70-mouse.hwdb \
-       hwdb/70-pointingstick.hwdb
+       hwdb/70-pointingstick.hwdb \
+       hwdb/70-touchpad.hwdb
  
  SYSINIT_TARGET_WANTS += \
        systemd-hwdb-update.service
@@@ -4861,7 -4863,7 +4863,7 @@@ test_keymap_util_SOURCES = 
        src/locale/keymap-util.h
  
  test_keymap_util_LDADD = \
 -      libshared.la \
 +      libsystemd-shared.la \
        -ldl
  
  tests += \
@@@ -6417,7 -6419,7 +6419,7 @@@ install-tree: al
  .PHONY: valgrind-tests
  valgrind-tests: $(TESTS)
        $(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
 -              if file $$f | grep -q shell; then \
 +              if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \
                echo -e "$${x}Skipping non-binary $$f"; else \
                echo -e "$${x}Running $$f"; \
                $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \