X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=85cd086ae57666377fcaaee6c4e0c53aa319e582;hp=6601e18d034fa8a0e8e235b6a1df75ab58d795bd;hb=643a14a5271ed19ec30a9882d4b9e9ae1c357fb1;hpb=f33d3ec1d7521c91da8b30ad5cb345d6416bb07d

diff --git a/Makefile.am b/Makefile.am
index 6601e18d0..85cd086ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#
 #  This file is part of systemd.
 #
 #  Copyright 2010-2012 Lennart Poettering
@@ -123,9 +125,7 @@ AM_CPPFLAGS = \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/shared \
-	-I $(top_srcdir)/src/readahead \
 	-I $(top_srcdir)/src/login \
-	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
 	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/udev
@@ -556,6 +556,9 @@ noinst_LTLIBRARIES += \
 	libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
+	src/missing.h \
+	src/linux/auto_dev-ioctl.h \
+	src/linux/fanotify.h \
 	src/shared/util.c \
 	src/shared/util.h \
 	src/shared/virt.c \
@@ -597,14 +600,12 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/utmp-wtmp.h \
 	src/shared/watchdog.c \
 	src/shared/watchdog.h \
-	src/shared/umount.c \
-	src/shared/umount.h \
 	src/shared/spawn-ask-password-agent.c \
 	src/shared/spawn-ask-password-agent.h \
 	src/shared/mount-setup.c \
 	src/shared/mount-setup.h \
-	src/shared/machine-id-setup.c \
-	src/shared/machine-id-setup.h \
+	src/shared/machine-id-util.c \
+	src/shared/machine-id-util.h \
 	src/shared/loopback-setup.h \
 	src/shared/loopback-setup.c \
 	src/shared/specifier.c \
@@ -612,7 +613,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/spawn-polkit-agent.c \
 	src/shared/spawn-polkit-agent.h \
 	src/shared/list.h \
-	src/shared/macro.h
+	src/shared/macro.h \
+	src/shared/ask-password-api.h
 
 libsystemd_shared_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -691,9 +693,6 @@ noinst_LTLIBRARIES += \
 
 libsystemd_core_la_SOURCES = \
 	src/def.h \
-	src/missing.h \
-	src/linux/auto_dev-ioctl.h \
-	src/linux/fanotify.h \
 	src/core/unit.c \
 	src/core/unit.h \
 	src/core/job.c \
@@ -781,9 +780,7 @@ libsystemd_core_la_SOURCES = \
 	src/core/special.h \
 	src/core/bus-errors.h \
 	src/core/build.h \
-	src/core/ask-password-api.h \
 	src/core/sysfs-show.h \
-	src/core/polkit.h \
 	src/core/dbus-loop.h
 
 nodist_libsystemd_core_la_SOURCES = \
@@ -815,7 +812,7 @@ libsystemd_core_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
-	src/main.c
+	src/core/main.c
 
 systemd_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -828,7 +825,7 @@ systemd_LDADD = \
 
 # ------------------------------------------------------------------------------
 test_engine_SOURCES = \
-	src/test-engine.c
+	test/test-engine.c
 
 test_engine_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -839,7 +836,7 @@ test_engine_LDADD = \
 	libsystemd-daemon.la
 
 test_job_type_SOURCES = \
-	src/test-job-type.c
+	test/test-job-type.c
 
 test_job_type_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -849,51 +846,51 @@ test_job_type_LDADD = \
 	libsystemd-core.la
 
 test_ns_SOURCES = \
-	src/test-ns.c
+	test/test-ns.c
 
 test_ns_LDADD = \
 	libsystemd-core.la
 
 test_loopback_SOURCES = \
-	src/test-loopback.c
+	test/test-loopback.c
 
 test_loopback_LDADD = \
 	libsystemd-shared.la
 
 test_hostname_SOURCES = \
-	src/test-hostname.c
+	test/test-hostname.c
 
 test_hostname_LDADD = \
 	libsystemd-shared.la
 
 test_daemon_SOURCES = \
-	src/test-daemon.c
+	test/test-daemon.c
 
 test_daemon_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-	src/test-cgroup.c
+	test/test-cgroup.c
 
 test_cgroup_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
 test_env_replace_SOURCES = \
-	src/test-env-replace.c
+	test/test-env-replace.c
 
 test_env_replace_LDADD = \
 	libsystemd-shared.la
 
 test_strv_SOURCES = \
-	src/test-strv.c
+	test/test-strv.c
 
 test_strv_LDADD = \
 	libsystemd-shared.la
 
 test_install_SOURCES = \
-	src/test-install.c
+	test/test-install.c
 
 test_install_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -904,7 +901,7 @@ test_install_LDADD = \
 	libsystemd-shared.la
 
 test_watchdog_SOURCES = \
-	src/test-watchdog.c
+	test/test-watchdog.c
 
 test_watchdog_LDADD = \
 	libsystemd-shared.la
@@ -950,6 +947,8 @@ pkginclude_HEADERS += \
 
 # ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
+	src/umount.c \
+	src/umount.h \
 	src/shutdown.c
 
 systemd_shutdown_LDADD = \
@@ -979,7 +978,7 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-	src/machine-id-main.c
+	src/machine-id-setup.c
 
 systemd_machine_id_setup_LDADD = \
 	libsystemd-label.la \
@@ -1594,6 +1593,8 @@ libgudev_1_0_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_builddir)/src\
 	-I$(top_srcdir)/src\
+	-I$(top_builddir)/src/udev \
+	-I$(top_srcdir)/src/udev \
 	-I$(top_builddir)/src/udev/gudev \
 	-I$(top_srcdir)/src/udev/gudev \
 	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
@@ -1642,43 +1643,45 @@ src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud
 	    $@.tmp && mv $@.tmp $@
 
 if ENABLE_INTROSPECTION
-src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la $(G_IR_SCANNER)
-	$(AM_V_GEN)$(G_IR_SCANNER) -v \
-		--warn-all \
-		--namespace GUdev \
-		--nsversion=1.0 \
-		--include=GObject-2.0 \
-		--library=gudev-1.0 \
-		--library-path=$(top_builddir)/src/udev \
-		--library-path=$(top_builddir)/src/udev/gudev \
-		--output $@ \
-		--pkg=glib-2.0 \
-		--pkg=gobject-2.0 \
-		--pkg-export=gudev-1.0 \
-		--c-include=gudev/gudev.h \
-		-I$(top_srcdir)/src/udev \
-		-I$(top_builddir)/src/udev \
-		-D_GUDEV_COMPILATION \
-		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
-		$(top_srcdir)/src/udev/gudev/gudev.h \
-		$(top_srcdir)/src/udev/gudev/gudevtypes.h \
-		$(top_srcdir)/src/udev/gudev/gudevenums.h \
-		$(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
-		$(top_srcdir)/src/udev/gudev/gudevclient.h \
-		$(top_srcdir)/src/udev/gudev/gudevdevice.h \
-		$(top_srcdir)/src/udev/gudev/gudevenumerator.h \
-		$(top_srcdir)/src/udev/gudev/gudevclient.c \
-		$(top_srcdir)/src/udev/gudev/gudevdevice.c \
-		$(top_srcdir)/src/udev/gudev/gudevenumerator.c
-
-src/udev/gudev/GUdev-1.0.typelib: src/udev/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-	$(AM_V_GEN)g-ir-compiler $< -o $@
-
-girdir = $(GIRDIR)
+-include $(INTROSPECTION_MAKEFILE)
+
+src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
+
+src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
+
+src_udev_gudev_GUdev_1_0_gir_CFLAGS = \
+	$(INCLUDES) \
+	-D_GUDEV_COMPILATION \
+	-D_GUDEV_WORK_AROUND_DEV_T_BUG \
+	-I$(top_srcdir)/src/udev \
+	-I$(top_builddir)/src/udev
+
+src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
+
+src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+	--pkg-export=gudev-1.0 \
+	--warn-all
+
+src_udev_gudev_GUdev_1_0_gir_FILES = \
+	$(top_srcdir)/src/udev/gudev/gudev.h \
+	$(top_srcdir)/src/udev/gudev/gudevtypes.h \
+	$(top_srcdir)/src/udev/gudev/gudevenums.h \
+	$(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
+	$(top_srcdir)/src/udev/gudev/gudevclient.h \
+	$(top_srcdir)/src/udev/gudev/gudevdevice.h \
+	$(top_srcdir)/src/udev/gudev/gudevenumerator.h \
+	$(top_srcdir)/src/udev/gudev/gudevclient.c \
+	$(top_srcdir)/src/udev/gudev/gudevdevice.c \
+	$(top_srcdir)/src/udev/gudev/gudevenumerator.c
+
+INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir
+INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
+
+girdir = $(datadir)/gir-1.0
 gir_DATA = \
 	src/udev/gudev/GUdev-1.0.gir
 
-typelibsdir = $(GIRTYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = \
 	src/udev/gudev/GUdev-1.0.typelib
 
@@ -1859,7 +1862,7 @@ libsystemd_id128_la_LIBADD = \
 	libsystemd-shared.la
 
 test_id128_SOURCES = \
-	src/test-id128.c
+	test/test-id128.c
 
 test_id128_LDADD = \
 	libsystemd-shared.la \
@@ -2348,7 +2351,8 @@ endif
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c \
-	src/polkit.c
+	src/polkit.c \
+	src/polkit.h
 
 systemd_hostnamed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2398,7 +2402,8 @@ endif
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
 	src/locale/localed.c \
-	src/polkit.c
+	src/polkit.c \
+	src/polkit.h
 
 systemd_localed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2459,7 +2464,8 @@ endif
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c \
-	src/polkit.c
+	src/polkit.c \
+	src/polkit.h
 
 systemd_timedated_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2524,6 +2530,7 @@ systemd_logind_SOURCES = \
 	src/login/logind-user-dbus.c \
 	src/dbus-loop.c \
 	src/polkit.c \
+	src/polkit.h \
 	src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \