X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=41a0f77528282d8886858d2834017c96fd61b21b;hb=cda8836c1c2fb301a0d3c9182c004c655bf1fdff;hp=2305caff6e39d6e3d336b5f4b37126303da96793;hpb=c6edc23d5f8a483e93a891bf7eb76b5f4caf2fb4;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2305caff6..41a0f7752 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,7 @@ PKTTYAGENT=$(bindir)/pkttyagent
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
-pkgincludedir=$(includedir)/elogind
+pkgincludedir=$(includedir)/elogind/systemd
 udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
@@ -152,6 +152,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libelogind/sd-bus \
 	-I $(top_srcdir)/src/libelogind/sd-event \
 	-I $(top_srcdir)/src/libelogind/sd-login \
+	-I $(top_srcdir)/src/update-utmp \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -298,8 +299,6 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
 	src/basic/missing.h \
-	src/basic/musl_missing.h \
-	src/basic/musl_missing.c \
 	src/basic/capability-util.c \
 	src/basic/capability-util.h \
 	src/basic/conf-files.c \
@@ -344,6 +343,8 @@ libbasic_la_SOURCES = \
 	src/basic/escape.h \
 	src/basic/path-util.c \
 	src/basic/path-util.h \
+	src/basic/parse-printf-format.c \
+	src/basic/parse-printf-format.h \
 	src/basic/time-util.c \
 	src/basic/time-util.h \
 	src/basic/locale-util.c \
@@ -413,9 +414,7 @@ libbasic_la_SOURCES = \
 	src/basic/copy.c \
 	src/basic/copy.h \
 	src/basic/alloc-util.h \
-	src/basic/alloc-util.c \
-	src/basic/parse-printf-format.c \
-	src/basic/parse-printf-format.h
+	src/basic/alloc-util.c
 
 nodist_libbasic_la_SOURCES = \
 	src/basic/errno-from-name.h \
@@ -441,16 +440,24 @@ noinst_LTLIBRARIES += \
 	libshared.la
 
 libshared_la_SOURCES = \
+	src/shared/bus-util.c \
+	src/shared/bus-util.h \
+	src/shared/clean-ipc.c \
+	src/shared/clean-ipc.h \
 	src/shared/conf-parser.c \
 	src/shared/conf-parser.h \
+	src/shared/musl_missing.h \
+	src/shared/musl_missing.c \
 	src/shared/pager.c \
 	src/shared/pager.h \
 	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h \
-	src/shared/clean-ipc.c \
-	src/shared/clean-ipc.h \
-	src/shared/bus-util.c \
-	src/shared/bus-util.h
+	src/shared/spawn-polkit-agent.h
+
+if HAVE_UTMP
+libshared_la_SOURCES += \
+	src/shared/utmp-wtmp.c \
+	src/update-utmp/update-utmp.c
+endif
 
 if HAVE_ACL
 libshared_la_SOURCES += \
@@ -625,6 +632,19 @@ pkginclude_HEADERS += \
 	src/systemd/sd-id128.h \
 	src/systemd/_sd-common.h
 
+header-install-hook:
+	$(MKDIR_P) $(DESTDIR)/$(pkgincludedir)
+	cd $(DESTDIR)/$(includedir)/elogind && \
+		for hdr in $(notdir $(pkginclude_HEADERS)) ; do \
+		        rm -f $$hdr ; \
+			$(LN_S) systemd/$$hdr $$hdr ; \
+		done
+
+header-uninstall-hook:
+	m -f $(DESTDIR)/$(includedir)/elogind/*.h
+
+INSTALL_EXEC_HOOKS += header-install-hook
+UNINSTALL_EXEC_HOOKS += header-uninstall-hook
 
 lib_LTLIBRARIES += \
 	libelogind.la
@@ -664,6 +684,7 @@ libelogind_core_la_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
+	src/login/logind-utmp.c \
 	src/login/logind-acl.h \
 	src/core/cgroup.h \
 	src/core/cgroup.c \