diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:20:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:20:07 -0400 |
| commit | cc3d6b3f24ae5e5e8f2e87c1d059656203c0fc1b (patch) | |
| tree | bc7ab5729d732f1d3ba263ffe0c100525fa85df0 | |
| parent | e2582041327daab7590c369e99988ab4c827a77b (diff) | |
| parent | b9662e016e0a073b088d36a75ee45543d3b60aaa (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libshared/Makefile
# src/libsystemd/src/Makefile
# src/libsystemd/src/sd-journal/Makefile
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/libshared/Makefile | 6 | ||||
| -rw-r--r-- | src/libsystemd/src/Makefile | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index d92ed9bddc..a36f8b2d5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1413,7 +1413,7 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ -#@src/libsystemd/src/Makefile +#@src/libsystemd/src/sd-journal/Makefile audit_list_includes = -include linux/audit.h -include missing.h if HAVE_AUDIT audit_list_includes += -include libaudit.h @@ -3465,14 +3465,12 @@ test_netlink_SOURCES = \ test_netlink_LDADD = \ libshared.la -#@src/libshared/Makefile test_local_addresses_SOURCES = \ src/libsystemd/sd-netlink/test-local-addresses.c test_local_addresses_LDADD = \ libshared.la -#@src/libsystemd/src/Makefile test_resolve_SOURCES = \ src/libsystemd/sd-resolve/test-resolve.c diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 914b38868f..66000b782c 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -139,12 +139,6 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) -test_local_addresses_SOURCES = \ - src/libsystemd/sd-netlink/test-local-addresses.c - -test_local_addresses_LDADD = \ - libshared.la - systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 44bf110437..5ebeb9d7fa 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -238,6 +238,12 @@ test_netlink_SOURCES = \ test_netlink_LDADD = \ libshared.la +test_local_addresses_SOURCES = \ + src/libsystemd/sd-netlink/test-local-addresses.c + +test_local_addresses_LDADD = \ + libshared.la + test_resolve_SOURCES = \ src/libsystemd/sd-resolve/test-resolve.c |