X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ab07d3beeae09e99dd9090e46fed697ef28f5463;hp=417074945ff862b35c3bce63144fa47f2c0f25c6;hb=20b63d12b533daf2e9b2936ffb03074861e1673e;hpb=d7c7c334f56edab8cfc102b657366277a65738cf

diff --git a/Makefile.am b/Makefile.am
index 417074945..ab07d3bee 100644
--- 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/json.c \
+	src/shared/json.h \
 	src/shared/bus-label.c \
 	src/shared/bus-label.h \
 	src/shared/gpt.h \
@@ -1252,7 +1254,7 @@ src/shared/cap-list.txt:
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
 
 src/shared/cap-to-name.h: src/shared/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
 
 src/shared/cap-from-name.gperf: src/shared/cap-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
@@ -1366,6 +1368,7 @@ tests += \
 	test-tables \
 	test-device-nodes \
 	test-xml \
+	test-json \
 	test-architecture \
 	test-socket-util \
 	test-fdset \
@@ -1686,6 +1689,13 @@ test_xml_SOURCES = \
 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
 
@@ -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-hwdb/hwdb-intenal.h
+	src/libsystemd/sd-hwdb/hwdb-internal.h
 
 nodist_libsystemd_internal_la_SOURCES = \
 	src/libsystemd/libsystemd.sym
@@ -3179,15 +3189,15 @@ nodist_userunit_DATA += \
 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
 
+EXTRA_DIST += \
+	units/user/systemd-consoled.service.in
+
 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-hwdb-def.h \
 	src/libudev/libudev-hwdb.c
 
 libudev_la_CFLAGS = \