diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
| commit | a3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch) | |
| tree | 52384648eb1383dc1bdf2916147f260cbccba71e /src/udev | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/Makefile b/src/udev/Makefile index 98bffe6720..187712f651 100644 --- a/src/udev/Makefile +++ b/src/udev/Makefile @@ -141,12 +141,12 @@ libudev_core_la_SOURCES += \ dist_udevrules_DATA += \ rules/80-drivers.rules -endif +endif # HAVE_KMOD ifneq ($(HAVE_BLKID),) libudev_core_la_SOURCES += \ src/udev/udev-builtin-blkid.c -endif +endif # HAVE_BLKID ifneq ($(HAVE_ACL),) libudev_core_la_SOURCES += \ @@ -154,7 +154,7 @@ libudev_core_la_SOURCES += \ src/login/logind-acl.c \ src/libsystemd/sd-login/sd-login.c \ src/systemd/sd-login.h -endif +endif # HAVE_ACL systemd_udevd_SOURCES = \ src/udev/udevd.c |