X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0c89ac4887cde3d66396011cc82755b82c11934b;hp=76c6e3f852530d9a7212404dfc29bb7daf5bb2b0;hb=98d5c9dbd0d47bc1c91dd54514d316cc1c590b05;hpb=f4f4df01e7f959b6a2d76b58a815a5a3feb0bb67

diff --git a/Makefile.am b/Makefile.am
index 76c6e3f85..0c89ac488 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 \
@@ -409,14 +407,12 @@ endif
 libshared_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(ACL_CFLAGS) \
-	$(LIBIDN_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
 libshared_la_LIBADD = \
 	libelogind-internal.la \
 	$(UDEV_LIBS) \
 	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
 gperf_txt_sources = \
@@ -476,7 +472,6 @@ libelogind_internal_la_SOURCES = \
 	src/systemd/sd-login.h \
 	src/systemd/sd-id128.h \
 	src/systemd/sd-daemon.h \
-	src/systemd/sd-path.h \
 	src/libelogind/libelogind.sym \
 	src/libelogind/sd-bus/sd-bus.c \
 	src/libelogind/sd-bus/bus-control.c \
@@ -521,8 +516,7 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-event/event-util.h \
 	src/libelogind/sd-id128/sd-id128.c \
 	src/libelogind/sd-daemon/sd-daemon.c \
-	src/libelogind/sd-login/sd-login.c \
-	src/libelogind/sd-path/sd-path.c
+	src/libelogind/sd-login/sd-login.c
 
 libelogind_internal_la_LIBADD = \
 	libbasic.la \
@@ -911,8 +905,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 += \
@@ -922,8 +915,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                                             \
@@ -933,7 +925,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
 	        exit 1;                                                        \
             fi; done
 
-dist: dist-check-compat-libs
+dist:
 
 .PHONY: git-tag
 git-tag:
@@ -1014,7 +1006,6 @@ test-libelogind-sym.c: \
 		src/systemd/sd-daemon.h \
 		src/systemd/sd-login.h \
 		src/systemd/sd-bus.h \
-		src/systemd/sd-path.h \
 		src/systemd/sd-event.h
 	$(generate-sym-test)