condition: split out most of condition handling into libsystemd-shard

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 02a1aaef08ae8b8ad66595a2758eeda96293e85e..ee7dd2d6cf0bc43f26b5ab6dd770be58b7518d0b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -766,7 +766,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.c \
        src/shared/audit.h \
        src/shared/xml.c \
-       src/shared/xml.h
+       src/shared/xml.h \
+       src/shared/condition-util.c \
+       src/shared/condition-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -2047,6 +2049,20 @@ libsystemd_la_LIBADD = \
        $(RT_LIBS) \
        -lresolv
 
+libsystemd-install-hook:
+       libname=libsystemd.so && $(move-to-rootlibdir)
+       -$(MKDIR_P) $(DESTDIR)/var/log/journal
+       -chown 0:0 $(DESTDIR)/var/log/journal
+       -chmod 755 $(DESTDIR)/var/log/journal
+       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
+
+libsystemd-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
 pkgconfiglib_DATA += \
        src/libsystemd/libsystemd.pc
 
@@ -4231,7 +4247,8 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _daemon_la_SOURCES = \
        src/python-systemd/_daemon.c \
@@ -4252,7 +4269,8 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _reader_la_SOURCES = \
        src/python-systemd/_reader.c \
@@ -4341,6 +4359,9 @@ clean-python:
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
 
+EXTRA_DIST += \
+       src/compat-libs/linkwarning.h
+
 define generate-fake-lib
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
@@ -4428,6 +4449,7 @@ lib_LTLIBRARIES += \
        libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
+       src/compat-libs/libsystemd-journal.pc \
        src/compat-libs/libsystemd-login.pc \
        src/compat-libs/libsystemd-id128.pc \
        src/compat-libs/libsystemd-daemon.pc
@@ -4449,6 +4471,7 @@ UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
 endif
 
 EXTRA_DIST += \
+       src/compat-libs/libsystemd-journal.pc.in \
        src/compat-libs/libsystemd-login.pc.in \
        src/compat-libs/libsystemd-id128.pc.in \
        src/compat-libs/libsystemd-daemon.pc.in