X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bbc6330797bcbad2974957a226a7e459fbb4ef68;hp=fd7035f48ac2855d07e5985fa4e55d1040aa8c43;hb=167bf427227158dbcad675d951e67038f23a9486;hpb=18a4f5b6f2977120281715a4b9dfee46a303436b diff --git a/Makefile.am b/Makefile.am index fd7035f48..bbc633079 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,8 +131,6 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ - -I $(top_srcdir)/src/libudev \ - -I $(top_srcdir)/src/udev \ -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/libelogind/sd-bus \ -I $(top_srcdir)/src/libelogind/sd-event \ @@ -408,16 +406,12 @@ endif libshared_la_CFLAGS = \ $(AM_CFLAGS) \ - $(ACL_CFLAGS) \ - $(LIBIDN_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(ACL_CFLAGS) libshared_la_LIBADD = \ libelogind-internal.la \ $(UDEV_LIBS) \ - $(ACL_LIBS) \ - $(LIBIDN_LIBS) \ - $(SECCOMP_LIBS) + $(ACL_LIBS) gperf_txt_sources = \ src/basic/errno-list.txt @@ -564,13 +558,11 @@ pkgconfiglib_DATA += \ src/libelogind/libelogind.pc pkginclude_HEADERS += \ - src/systemd/sd-bus.h \ - src/systemd/sd-bus-protocol.h \ - src/systemd/sd-bus-vtable.h \ - src/systemd/sd-event.h \ src/systemd/sd-login.h \ + src/systemd/sd-messages.h \ src/systemd/sd-id128.h \ - src/systemd/sd-daemon.h + src/systemd/_sd-common.h + lib_LTLIBRARIES += \ libelogind.la @@ -909,8 +901,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ - --with-rootprefix=$$dc_install_base \ - --enable-compat-libs + --with-rootprefix=$$dc_install_base if ENABLE_SPLIT_USR DISTCHECK_CONFIGURE_FLAGS += \ @@ -920,8 +911,7 @@ DISTCHECK_CONFIGURE_FLAGS += \ --disable-split-usr endif -.PHONY: dist-check-compat-libs dist-check-help -dist-check-compat-libs: +.PHONY: dist-check-help dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) for i in $(abspath $^); do \ @@ -931,7 +921,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) exit 1; \ fi; done -dist: dist-check-compat-libs +dist: .PHONY: git-tag git-tag: