[systemd-commits] 3 commits - .gitignore Makefile.am

[Kay Sievers]

 .gitignore  |    2 ++
 Makefile.am |   19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 2fa495c8a4ea25cb96daebb8aa0d146b74353016
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Mar 25 23:16:31 2014 +0100

    build-sys: fix library link order

diff --git a/Makefile.am b/Makefile.am
index 74fbadf..3d9e5c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3528,8 +3528,8 @@ systemd_coredump_SOURCES = \
 systemd_coredump_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-internal.la
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-coredump

commit 78a337bd30a42d3d58846ab81f1541afbe7a99bb
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Mar 25 23:05:52 2014 +0100

    gitignore update

diff --git a/.gitignore b/.gitignore
index 74792b3..d722423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@
 /systemd-inhibit
 /systemd-initctl
 /systemd-journal-gatewayd
+/systemd-journal-remote
 /systemd-journald
 /systemd-kmsg-syslogd
 /systemd-localed
@@ -186,6 +187,7 @@
 /test-strv
 /test-strxcpyx
 /test-tables
+/test-rtnl-manual
 /test-time
 /test-timedate-sntp
 /test-tmpfiles

commit 307e6d8304b80000699e81aa988ae315af4ac218
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Mar 25 23:04:13 2014 +0100

    build-sys: split-off internal libsystemd-resolve

diff --git a/Makefile.am b/Makefile.am
index 62a8a59..74fbadf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2109,8 +2109,6 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-rtnl/rtnl-message.c \
 	src/libsystemd/sd-rtnl/rtnl-util.h \
 	src/libsystemd/sd-rtnl/rtnl-util.c \
-	src/libsystemd/sd-resolve/sd-resolve.c \
-	src/libsystemd/sd-resolve/resolve-util.h \
 	src/libsystemd/sd-id128/sd-id128.c \
 	src/libsystemd/sd-daemon/sd-daemon.c \
 	src/libsystemd/sd-login/sd-login.c
@@ -2126,8 +2124,17 @@ libsystemd_internal_la_CFLAGS = \
 libsystemd_internal_la_LIBADD = \
 	$(RT_LIBS)
 
+libsystemd_resolve_la_SOURCES = \
+	src/libsystemd/sd-resolve/sd-resolve.c \
+	src/libsystemd/sd-resolve/resolve-util.h
+
+libsystemd_resolve_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
 noinst_LTLIBRARIES += \
-	libsystemd-internal.la
+	libsystemd-internal.la \
+	libsystemd-resolve.la
 
 libsystemd_dump_la_SOURCES = \
 	src/libsystemd/sd-bus/bus-dump.c \
@@ -2156,6 +2163,7 @@ BUILT_SOURCES += \
 
 libsystemd_la_SOURCES = \
 	$(libsystemd_internal_la_SOURCES) \
+	$(libsystemd_resolve_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES)
 
 nodist_libsystemd_la_SOURCES = \
@@ -2420,6 +2428,7 @@ test_resolve_SOURCES = \
 
 test_resolve_LDADD = \
 	libsystemd-internal.la \
+	libsystemd-resolve.la \
 	libsystemd-shared.la \
 	-lresolv