Prep v230: Move musl_missing and parse-printf-format to libshared.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bf9082428a387bf2799a326ff323e6e409ff3f1a..67238fa0f4c3a0ae146e16ec0fa7c1548d4a3176 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -298,8 +298,6 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
        src/basic/missing.h \
-       src/basic/musl_missing.h \
-       src/basic/musl_missing.c \
        src/basic/capability-util.c \
        src/basic/capability-util.h \
        src/basic/conf-files.c \
@@ -413,9 +411,7 @@ libbasic_la_SOURCES = \
        src/basic/copy.c \
        src/basic/copy.h \
        src/basic/alloc-util.h \
-       src/basic/alloc-util.c \
-       src/basic/parse-printf-format.c \
-       src/basic/parse-printf-format.h
+       src/basic/alloc-util.c
 
 nodist_libbasic_la_SOURCES = \
        src/basic/errno-from-name.h \
@@ -441,16 +437,20 @@ noinst_LTLIBRARIES += \
        libshared.la
 
 libshared_la_SOURCES = \
+       src/shared/bus-util.c \
+       src/shared/bus-util.h \
+       src/shared/clean-ipc.c \
+       src/shared/clean-ipc.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
+       src/shared/musl_missing.h \
+       src/shared/musl_missing.c \
        src/shared/pager.c \
        src/shared/pager.h \
+       src/shared/parse-printf-format.c \
+       src/shared/parse-printf-format.h \
        src/shared/spawn-polkit-agent.c \
-       src/shared/spawn-polkit-agent.h \
-       src/shared/clean-ipc.c \
-       src/shared/clean-ipc.h \
-       src/shared/bus-util.c \
-       src/shared/bus-util.h
+       src/shared/spawn-polkit-agent.h
 
 if HAVE_ACL
 libshared_la_SOURCES += \
@@ -629,6 +629,7 @@ header-install-hook:
        $(MKDIR_P) $(DESTDIR)/$(pkgincludedir)
        cd $(DESTDIR)/$(includedir)/elogind && \
                for hdr in $(notdir $(pkginclude_HEADERS)) ; do \
+                       rm -f $$hdr ; \
                        $(LN_S) systemd/$$hdr $$hdr ; \
                done