X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=93583a686a47d908316dc44621c8aeef62134e8a;hp=13eba27fed222115f2bbc3ba03150f176c0678d7;hb=b87b8b2b5205c0584da220f73322ea4732d44013;hpb=30bdd695250eeecbf0b36c1e3c90d67ca03953ed diff --git a/Makefile.am b/Makefile.am index 13eba27fe..93583a686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -793,7 +793,8 @@ libsystemd_acl_la_CFLAGS = \ $(ACL_CFLAGS) libsystemd_acl_la_LIBADD = \ - $(ACL_LIBS) + $(ACL_LIBS) \ + libsystemd-shared.la endif # ------------------------------------------------------------------------------ @@ -1612,7 +1613,7 @@ libsystemd_daemon_la_SOURCES = \ src/libsystemd-daemon/sd-daemon.c libsystemd_daemon_internal_la_SOURCES = \ - $(libsystemd_daemon_la_SOURCES) + $(libsystemd_daemon_la_SOURCES) libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1641,7 +1642,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la noinst_LTLIBRARIES += \ - libsystemd-daemon-internal.la + libsystemd-daemon-internal.la pkgconfiglib_DATA += \ src/libsystemd-daemon/libsystemd-daemon.pc @@ -1663,14 +1664,16 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-message.c \ src/libsystemd-bus/bus-message.h \ src/libsystemd-bus/bus-signature.c \ + src/libsystemd-bus/bus-signature.h \ src/libsystemd-bus/bus-type.c \ src/libsystemd-bus/bus-type.h libsystemd_bus_la_LIBADD = \ - libsystemd-id128-internal.la + libsystemd-id128-internal.la \ + libsystemd-shared.la noinst_LTLIBRARIES += \ - libsystemd-bus.la + libsystemd-bus.la noinst_tests += \ test-bus-marshal \ @@ -2501,6 +2504,11 @@ journalctl_LDADD = \ libsystemd-id128-internal.la \ libsystemd-logs.la +if HAVE_ACL +journalctl_LDADD += \ + libsystemd-acl.la +endif + if HAVE_QRENCODE journalctl_SOURCES += \ src/journal/journal-qrcode.c \ @@ -3582,7 +3590,7 @@ _journal_la_SOURCES = \ _journal_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) _journal_la_LDFLAGS = \ @@ -3603,7 +3611,7 @@ id128_la_SOURCES = \ id128_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) \ -I$(top_builddir)/src/python-systemd @@ -3624,7 +3632,7 @@ _daemon_la_SOURCES = \ _daemon_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) \ -I$(top_builddir)/src/python-systemd @@ -3645,7 +3653,7 @@ _reader_la_SOURCES = \ _reader_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) _reader_la_LDFLAGS = \ @@ -3682,7 +3690,7 @@ sphinx-%: destdir-sphinx: all dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \ $(MAKE) DESTDIR="$$dir" install && \ - $(MAKE) DESTDIR="$$dir" sphinx-html && \ + $(MAKE) DESTDIR="$$dir" sphinx-html && \ rm -rf "$$dir" endif @@ -3977,7 +3985,7 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS) clean-local: $(CLEAN_LOCAL_HOOKS) rm -rf $(abs_srcdir)/install-tree rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \ - $(abs_srcdir)/hwdb/iab.txt + $(abs_srcdir)/hwdb/iab.txt DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ @@ -4008,7 +4016,7 @@ hwdb-update: ( cd $(top_srcdir)/hwdb && \ wget -N http://www.linux-usb.org/usb.ids \ http://pci-ids.ucw.cz/v2.2/pci.ids \ - http://standards.ieee.org/develop/regauth/oui/oui.txt \ + http://standards.ieee.org/develop/regauth/oui/oui.txt \ http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl )