[systemd-commits] 2 commits - docs/libudev Makefile.am

[Dave Reisner]

 Makefile.am              |    9 ++++-----
 docs/libudev/Makefile.am |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 0f5a314b2ec348c241e4a484ee505bbd2eddb19e
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Sun Dec 14 10:55:16 2014 -0500

    build-sys: fix distcheck
    
    - fix misspelling in filename (intenal -> internal)
    - remove deleted hwdb-related file (nuked with sd-hwdb refactor)

diff --git a/Makefile.am b/Makefile.am
index 909b583..84b587d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2718,7 +2718,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
@@ -3332,7 +3332,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 = \
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index cf9a452..2998c35 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_HFILES=
 
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES = libudev-private.h libudev-hwdb-def.h
+IGNORE_HFILES = libudev-private.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png

commit 7cd3aba6bdd26583f62b318f18def8939de3274f
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Sun Dec 14 10:40:25 2014 -0500

    build-sys: always distribute systemd-consoled.service.in
    
    Similar to how we handle other facilities that can be flagged out at
    configure time, we should always distribute this input file.
    
    http://lists.freedesktop.org/archives/systemd-devel/2014-December/026272.html

diff --git a/Makefile.am b/Makefile.am
index 4545cfe..909b583 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3179,15 +3179,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)