chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: simplify set_location()
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 4545cfebebe2cd856deef7a39d7585480e279652..ab07d3beeae09e99dd9090e46fed697ef28f5463 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-868,6
+868,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/audit.h \
src/shared/xml.c \
src/shared/xml.h \
src/shared/audit.h \
src/shared/xml.c \
src/shared/xml.h \
+ src/shared/json.c \
+ src/shared/json.h \
src/shared/bus-label.c \
src/shared/bus-label.h \
src/shared/gpt.h \
src/shared/bus-label.c \
src/shared/bus-label.h \
src/shared/gpt.h \
@@
-1366,6
+1368,7
@@
tests += \
test-tables \
test-device-nodes \
test-xml \
test-tables \
test-device-nodes \
test-xml \
+ test-json \
test-architecture \
test-socket-util \
test-fdset \
test-architecture \
test-socket-util \
test-fdset \
@@
-1686,6
+1689,13
@@
test_xml_SOURCES = \
test_xml_LDADD = \
libsystemd-shared.la
test_xml_LDADD = \
libsystemd-shared.la
+test_json_SOURCES = \
+ src/test/test-json.c
+
+test_json_LDADD = \
+ libsystemd-shared.la \
+ -lm
+
test_list_SOURCES = \
src/test/test-list.c
test_list_SOURCES = \
src/test/test-list.c
@@
-2718,7
+2728,7
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-network/network-util.c \
src/libsystemd/sd-hwdb/sd-hwdb.c \
src/libsystemd/sd-hwdb/hwdb-util.h \
src/libsystemd/sd-network/network-util.c \
src/libsystemd/sd-hwdb/sd-hwdb.c \
src/libsystemd/sd-hwdb/hwdb-util.h \
- src/libsystemd/sd-hwdb/hwdb-intenal.h
+ src/libsystemd/sd-hwdb/hwdb-inte
r
nal.h
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym
@@
-3179,15
+3189,15
@@
nodist_userunit_DATA += \
USER_DEFAULT_TARGET_WANTS += \
systemd-consoled.service
USER_DEFAULT_TARGET_WANTS += \
systemd-consoled.service
-EXTRA_DIST += \
- units/user/systemd-consoled.service.in
-
tests += \
test-term-page \
test-term-parser \
test-unifont
endif
tests += \
test-term-page \
test-term-parser \
test-unifont
endif
+EXTRA_DIST += \
+ units/user/systemd-consoled.service.in
+
libsystemd_terminal_la_CFLAGS = \
$(AM_CFLAGS) \
$(TERMINAL_CFLAGS)
libsystemd_terminal_la_CFLAGS = \
$(AM_CFLAGS) \
$(TERMINAL_CFLAGS)
@@
-3332,7
+3342,6
@@
libudev_la_SOURCES =\
src/libudev/libudev-enumerate.c \
src/libudev/libudev-monitor.c \
src/libudev/libudev-queue.c \
src/libudev/libudev-enumerate.c \
src/libudev/libudev-monitor.c \
src/libudev/libudev-queue.c \
- src/libudev/libudev-hwdb-def.h \
src/libudev/libudev-hwdb.c
libudev_la_CFLAGS = \
src/libudev/libudev-hwdb.c
libudev_la_CFLAGS = \