readd journald.so install hooks under libsystemd.so

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 724e89b626cb0ce0221abde91343594c53a9f38d..08b94d7b1483f7d1e662e6d3a937e95e7d56b893 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1925,7 +1925,6 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
@@ -1991,6 +1990,7 @@ libsystemd_internal_la_SOURCES = \
        src/login/login-shared.h
 
 nodist_libsystemd_internal_la_SOURCES = \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
 libsystemd_internal_la_CFLAGS = \
@@ -2012,14 +2012,19 @@ noinst_LTLIBRARIES += \
        libsystemd-dump.la
 
 EXTRA_DIST += \
+       src/libsystemd/libsystemd.sym.m4 \
+       src/libsystemd/libsystemd.pc.in \
        src/libsystemd/sd-bus/bus-error-mapping.gperf \
        src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
-       src/libsystemd/libsystemd.pc.in
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
+BUILT_SOURCES += \
+       src/libsystemd/libsystemd.sym
+
 libsystemd_la_SOURCES = \
        $(libsystemd_internal_la_SOURCES) \
        $(libsystemd_journal_internal_la_SOURCES)
@@ -2034,7 +2039,7 @@ libsystemd_la_CFLAGS = \
 libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
        libsystemd-shared.la \
@@ -2042,6 +2047,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
 
@@ -2458,6 +2477,7 @@ dist_udevhwdb_DATA = \
        hwdb/20-bluetooth-vendor-product.hwdb \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
+       hwdb/20-net-ifname.hwdb \
        hwdb/60-keyboard.hwdb
 
 udevconfdir = $(sysconfdir)/udev
@@ -4335,6 +4355,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' <$< >$@
@@ -4422,6 +4445,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
@@ -4443,6 +4467,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
@@ -4756,7 +4781,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
        --disable-split-usr \
-       --enable-kdbus
+       --enable-kdbus \
+       --enable-compat-libs
 
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -4879,7 +4905,7 @@ define generate-sym-test
 endef
 
 test-libsystemd-sym.c: \
-               src/libsystemd/libsystemd.sym \
+               $(top_builddir)/src/libsystemd/libsystemd.sym \
                src/systemd/sd-journal.h \
                src/systemd/sd-daemon.h \
                src/systemd/sd-login.h \