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/libshared | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index dc9e222fc4..6bc8725521 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -109,19 +109,19 @@ libshared_la_SOURCES = \ ifneq ($(HAVE_UTMP),) libshared_la_SOURCES += \ src/shared/utmp-wtmp.c -endif +endif # HAVE_UTMP ifneq ($(HAVE_SECCOMP),) libshared_la_SOURCES += \ src/shared/seccomp-util.h \ src/shared/seccomp-util.c -endif +endif # HAVE_SECCOMP ifneq ($(HAVE_ACL),) libshared_la_SOURCES += \ src/shared/acl-util.c \ src/shared/acl-util.h -endif +endif # HAVE_ACL libshared_la_CFLAGS = \ $(AM_CFLAGS) \ |