diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:43:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:43:18 -0400 |
| commit | 4edbbb28e4419fc473d5675abd6abd0c450ca82c (patch) | |
| tree | d7605539e35e24746b9ac9c3692b75d20b07288a /src/grp-udev | |
| parent | 93fd8d3a035f6acb134adff0d6b34e7fba5e72af (diff) | |
`git diff`-guided cleanup
Diffstat (limited to 'src/grp-udev')
| -rw-r--r-- | src/grp-udev/Makefile | 10 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/Makefile | 6 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/net/Makefile | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile index e826b46a5c..ac635bfdba 100644 --- a/src/grp-udev/Makefile +++ b/src/grp-udev/Makefile @@ -43,11 +43,6 @@ dist_udevrules_DATA += \ rules/78-sound-card.rules \ rules/80-net-setup-link.rules -ifneq ($(HAVE_KMOD),) -dist_udevrules_DATA += \ - rules/80-drivers.rules -endif # HAVE_KMOD - nodist_udevrules_DATA += \ rules/99-systemd.rules @@ -75,6 +70,11 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service +ifneq ($(HAVE_KMOD),) +dist_udevrules_DATA += \ + rules/80-drivers.rules +endif # HAVE_KMOD + nested.subdirs += ata_id nested.subdirs += cdrom_id nested.subdirs += collect diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 01115354c7..54a61b24ce 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk noinst_LTLIBRARIES += \ libudev-core.la -$(outdir)/keyboard-keys-list.txt: +$(outdir)/keyboard-keys-list.txt: | $(outdir)/$(DEPDIR) $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ $(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt @@ -73,9 +73,9 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libsystemd-internal.la \ libsystemd-basic.la \ - libsystemd-shared.la \ - libsystemd-network.la \ libsystemd-staging.la \ + libsystemd-network.la \ + libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index 5094fa6050..afe70e8a3d 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -20,7 +20,6 @@ # # 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 |