INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
-DISTCHECK_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
+check_PROGRAMS =
+check_DATA =
+noinst_PROGRAMS =
+TESTS =
+udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I $(top_srcdir)/src/journal \
-I $(top_srcdir)/src/systemd \
-I $(top_srcdir)/src/core \
+ -I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev
AM_CFLAGS = $(WARNINGFLAGS)
systemd-detect-virt
dist_bin_SCRIPTS = \
- src/systemd-analyze
+ src/analyze/systemd-analyze
rootlibexec_PROGRAMS = \
systemd \
systemgenerator_PROGRAMS = \
systemd-getty-generator
-noinst_PROGRAMS = \
- test-engine \
- test-job-type \
- test-ns \
- test-loopback \
- test-hostname \
- test-daemon \
- test-cgroup \
- test-env-replace \
- test-strv \
- test-install \
- test-watchdog
-
dist_bashcompletion_DATA = \
bash-completion/systemd-bash-completion.sh
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/udev-control.socket \
- units/udev-kernel.socket
+ units/systemd-udev-control.socket \
+ units/systemd-udev-kernel.socket
nodist_systemunit_DATA = \
units/getty@.service \
units/fsck-root.service \
units/rescue.service \
units/user@.service \
- units/udev.service \
- units/udev-trigger.service \
- units/udev-settle.service
+ units/systemd-udev.service \
+ units/systemd-udev-trigger.service \
+ units/systemd-udev-settle.service
dist_userunit_DATA = \
units/user/default.target \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
- units/udev.service \
- units/udev-trigger.service \
- units/udev-settle.service \
+ units/systemd-udev.service \
+ units/systemd-udev-trigger.service \
+ units/systemd-udev-settle.service \
introspect.awk \
man/custom-html.xsl
libsystemd-shared.la
libsystemd_shared_la_SOURCES = \
- src/linux/auto_dev-ioctl.h \
- src/linux/fanotify.h \
+ src/shared/linux/auto_dev-ioctl.h \
+ src/shared/linux/fanotify.h \
+ src/shared/missing.h \
src/shared/list.h \
src/shared/macro.h \
src/shared/def.h \
- src/shared/missing.h \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
libsystemd-shared.la \
libsystemd-dbus.la \
libudev.la \
- $(DBUS_LIBS) \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
src/core/systemd.pc.in
# ------------------------------------------------------------------------------
+noinst_PROGRAMS += \
+ test-engine \
+ test-job-type \
+ test-ns \
+ test-loopback \
+ test-hostname \
+ test-daemon \
+ test-cgroup \
+ test-env-replace \
+ test-strv \
+ test-install \
+ test-watchdog
+
+TESTS += \
+ test-job-type \
+ test-env-replace \
+ test-strv
+
test_engine_SOURCES = \
src/test/test-engine.c
systemd_initctl_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
systemd_update_utmp_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
- $(DBUS_LIBS) \
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
systemd_fsck_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
- libudev.la \
- $(DBUS_LIBS)
+ libudev.la
# ------------------------------------------------------------------------------
systemd_timestamp_SOURCES = \
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
libsystemd-id128.la \
libsystemd-dbus.la \
libsystemd-logs.la
- $(DBUS_LIBS)
# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
src/libsystemd-daemon/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
SUBDIRS += \
- src/udev/docs
+ docs/libudev
+endif
include_HEADERS += \
- src/udev/libudev.h
+ src/libudev/libudev.h
lib_LTLIBRARIES += \
libudev.la
libudev_la_SOURCES =\
- src/udev/libudev-private.h \
- src/udev/libudev.c \
- src/udev/libudev-list.c \
- src/udev/libudev-util.c \
- src/udev/libudev-device.c \
- src/udev/libudev-enumerate.c \
- src/udev/libudev-monitor.c \
- src/udev/libudev-queue.c
+ src/libudev/libudev-private.h \
+ src/libudev/libudev.c \
+ src/libudev/libudev-list.c \
+ src/libudev/libudev-util.c \
+ src/libudev/libudev-device.c \
+ src/libudev/libudev-enumerate.c \
+ src/libudev/libudev-monitor.c \
+ src/libudev/libudev-queue.c
libudev_la_CFLAGS = \
$(AM_CFLAGS) \
$(AM_LDFLAGS) \
-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+libudev_la_LIBADD = \
+ libsystemd-shared.la
+
pkgconfiglib_DATA += \
- src/udev/libudev.pc
+ src/libudev/libudev.pc
EXTRA_DIST += \
- src/udev/libudev.pc.in
+ src/libudev/libudev.pc.in
CLEANFILES += \
- src/udev/libudev.pc
+ src/libudev/libudev.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libudev-install-move-hook:
libudev_private_la_SOURCES =\
$(libudev_la_SOURCES) \
- src/udev/libudev-util-private.c \
- src/udev/libudev-device-private.c \
- src/udev/libudev-queue-private.c
-
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
- src/udev/libudev-selinux-private.c
-endif
+ src/libudev/libudev-device-private.c \
+ src/libudev/libudev-queue-private.c
libudev_private_la_CFLAGS = \
$(AM_CFLAGS) \
- $(SELINUX_CFLAGS)
-fvisibility=default
libudev_private_la_LIBADD = \
- $(SELINUX_LIBS)
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
- man/udevd.8
+ man/systemd-udevd.8
udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
src/udev/udev.pc
EXTRA_DIST += \
- units/udev.service.in \
- units/udev-trigger.service.in \
- units/udev-settle.service.in
+ units/systemd-udev.service.in \
+ units/systemd-udev-trigger.service.in \
+ units/systemd-udev-settle.service.in
CLEANFILES += \
- units/udev.service \
- units/udev-trigger.service \
- units/udev-settle.service
+ units/systemd-udev.service \
+ units/systemd-udev-trigger.service \
+ units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
- ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
+ ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
+ ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
- ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
- ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
+ ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
+ ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
bin_PROGRAMS += \
udevadm
-udevlibexec_PROGRAMS = \
- udevd
+rootlibexec_PROGRAMS += \
+ systemd-udevd
noinst_LTLIBRARIES += \
libudev-core.la
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-kmod.c \
src/udev/udev-builtin-path_id.c \
- src/udev/udev-builtin-usb_id.c
+ src/udev/udev-builtin-usb_id.c \
+ src/libsystemd-daemon/sd-daemon.c
libudev_core_la_CFLAGS = \
$(AM_CFLAGS) \
libudev_core_la_LIBADD = \
libudev-private.la \
- libsystemd-daemon.la \
+ libsystemd-label.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
- src/login/logind-acl.c
+ src/login/logind-acl.c \
+ src/login/sd-login.c
libudev_core_la_LIBADD += \
- libsystemd-login.la \
libsystemd-acl.la
endif
-udevd_SOURCES = \
+systemd_udevd_SOURCES = \
src/udev/udevd.c
-udevd_LDADD = \
+systemd_udevd_LDADD = \
libudev-core.la
udevadm_SOURCES = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
-TESTS = \
- src/udev/test/udev-test.pl \
- src/udev/test/rules-test.sh
+TESTS += \
+ test/udev-test.pl \
+ test/rules-test.sh
-check_PROGRAMS = \
+noinst_PROGRAMS += \
test-libudev \
test-udev
test_libudev_SOURCES = \
- src/udev/test-libudev.c
+ src/test/test-libudev.c
test_libudev_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libudev.la
test_udev_SOURCES = \
- src/udev/test-udev.c
+ src/test/test-udev.c \
+ $(libudev_core_la_SOURCES) \
+ $(libudev_private_la_SOURCES)
+
+# The test-udev program needs everything compiled with relative path
+# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
+test_udev_CFLAGS = \
+ -DTEST_PREFIX=\"test\" \
+ $(libudev_core_la_CFLAGS) \
+ $(libudev_private_la_CFLAGS)
+
+test_udev_CPPFLAGS =\
+ $(libudev_core_la_CPPFLAGS)
test_udev_LDADD = \
- libudev-core.la \
- libudev-private.la \
- libsystemd-shared.la
+ libsystemd-label.la \
+ libsystemd-shared.la \
+ $(BLKID_LIBS) \
+ $(KMOD_LIBS) \
+ $(SELINUX_LIBS)
+
+if HAVE_ACL
+test_udev_LDADD += \
+ libsystemd-acl.la
+endif
-test_udev_DEPENDENCIES = \
- src/udev/test/sys
+check_DATA += \
+ test/sys
# packed sysfs test tree
-src/udev/test/sys:
- $(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz
+test/sys:
+ $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
test-sys-distclean:
- -rm -rf src/udev/test/sys
+ -rm -rf test/sys
DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
EXTRA_DIST += \
- src/udev/test/sys.tar.xz \
- $(TESTS) \
- src/udev/test/rule-syntax-check.py
+ test/sys.tar.xz \
+ test/udev-test.pl \
+ test/rules-test.sh \
+ test/rule-syntax-check.py
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
cdrom_id
dist_udevrules_DATA += \
- src/udev/cdrom_id/60-cdrom_id.rules
+ rules/60-cdrom_id.rules
# ------------------------------------------------------------------------------
collect_SOURCES = \
v4l_id
dist_udevrules_DATA += \
- src/udev/v4l_id/60-persistent-v4l.rules
+ rules/60-persistent-v4l.rules
# ------------------------------------------------------------------------------
accelerometer_SOURCES = \
accelerometer
dist_udevrules_DATA += \
- src/udev/accelerometer/61-accelerometer.rules
+ rules/61-accelerometer.rules
# ------------------------------------------------------------------------------
if ENABLE_GUDEV
+if ENABLE_GTK_DOC
SUBDIRS += \
- src/udev/gudev/docs
+ docs/gudev
+endif
libgudev_includedir = \
$(includedir)/gudev-1.0/gudev
libgudev_include_HEADERS = \
- src/udev/gudev/gudev.h \
- src/udev/gudev/gudevenums.h \
- src/udev/gudev/gudevenumtypes.h \
- src/udev/gudev/gudevtypes.h \
- src/udev/gudev/gudevclient.h \
- src/udev/gudev/gudevdevice.h \
- src/udev/gudev/gudevenumerator.h
+ src/gudev/gudev.h \
+ src/gudev/gudevenums.h \
+ src/gudev/gudevenumtypes.h \
+ src/gudev/gudevtypes.h \
+ src/gudev/gudevclient.h \
+ src/gudev/gudevdevice.h \
+ src/gudev/gudevenumerator.h
lib_LTLIBRARIES += libgudev-1.0.la
pkgconfiglib_DATA += \
- src/udev/gudev/gudev-1.0.pc
+ src/gudev/gudev-1.0.pc
EXTRA_DIST += \
- src/udev/gudev/gudev-1.0.pc.in
+ src/gudev/gudev-1.0.pc.in
CLEANFILES += \
- src/udev/gudev/gudev-1.0.pc
+ src/gudev/gudev-1.0.pc
libgudev_1_0_la_SOURCES = \
- src/udev/gudev/gudevenums.h \
- src/udev/gudev/gudevenumtypes.h \
- src/udev/gudev/gudevenumtypes.h\
- src/udev/gudev/gudevtypes.h \
- src/udev/gudev/gudevclient.h \
- src/udev/gudev/gudevclient.c \
- src/udev/gudev/gudevdevice.h \
- src/udev/gudev/gudevdevice.c \
- src/udev/gudev/gudevenumerator.h \
- src/udev/gudev/gudevenumerator.c \
- src/udev/gudev/gudevprivate.h
+ src/gudev/gudevenums.h \
+ src/gudev/gudevenumtypes.h \
+ src/gudev/gudevenumtypes.h\
+ src/gudev/gudevtypes.h \
+ src/gudev/gudevclient.h \
+ src/gudev/gudevclient.c \
+ src/gudev/gudevdevice.h \
+ src/gudev/gudevdevice.c \
+ src/gudev/gudevenumerator.h \
+ src/gudev/gudevenumerator.c \
+ src/gudev/gudevprivate.h
nodist_libgudev_1_0_la_SOURCES = \
- src/udev/gudev/gudevmarshal.h \
- src/udev/gudev/gudevmarshal.c \
- src/udev/gudev/gudevenumtypes.h \
- src/udev/gudev/gudevenumtypes.c
+ src/gudev/gudevmarshal.h \
+ src/gudev/gudevmarshal.c \
+ src/gudev/gudevenumtypes.h \
+ src/gudev/gudevenumtypes.c
BUILT_SOURCES += \
$(nodist_libgudev_1_0_la_SOURCES)
$(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 \
+ -I$(top_builddir)/src/gudev \
+ -I$(top_srcdir)/src/gudev \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-D_GUDEV_COMPILATION \
-DG_LOG_DOMAIN=\"GUdev\"
-export-symbols-regex '^g_udev_.*'
EXTRA_DIST += \
- src/udev/gudev/gudevmarshal.list \
- src/udev/gudev/gudevenumtypes.h.template \
- src/udev/gudev/gudevenumtypes.c.template \
- src/udev/gudev/gjs-example.js \
- src/udev/gudev/seed-example-enum.js \
- src/udev/gudev/seed-example.js
+ src/gudev/gudevmarshal.list \
+ src/gudev/gudevenumtypes.h.template \
+ src/gudev/gudevenumtypes.c.template \
+ src/gudev/gjs-example.js \
+ src/gudev/seed-example-enum.js \
+ src/gudev/seed-example.js
CLEANFILES += \
$(nodist_libgudev_1_0_la_SOURCES)
-src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
-src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
$(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
-src/udev/gudev/gudevenumtypes.h: src/udev/gudev/gudevenumtypes.h.template src/udev/gudev/gudevenums.h
+src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
$(AM_V_GEN)glib-mkenums --template $^ > \
$@.tmp && mv $@.tmp $@
-src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/udev/gudev/gudevenums.h
+src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
$(AM_V_GEN)glib-mkenums --template $^ > \
$@.tmp && mv $@.tmp $@
-if ENABLE_INTROSPECTION
+if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
-src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
+src/gudev/GUdev-1.0.gir: libgudev-1.0.la
-src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
+src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
-src_udev_gudev_GUdev_1_0_gir_CFLAGS = \
+src_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
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src/gdev \
+ -I$(top_builddir)/src/gdev
-src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
+src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
-src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+src_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
+src_gudev_GUdev_1_0_gir_FILES = \
+ $(top_srcdir)/src/gudev/gudev.h \
+ $(top_srcdir)/src/gudev/gudevtypes.h \
+ $(top_srcdir)/src/gudev/gudevenums.h \
+ $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
+ $(top_srcdir)/src/gudev/gudevclient.h \
+ $(top_srcdir)/src/gudev/gudevdevice.h \
+ $(top_srcdir)/src/gudev/gudevenumerator.h \
+ $(top_srcdir)/src/gudev/gudevclient.c \
+ $(top_srcdir)/src/gudev/gudevdevice.c \
+ $(top_srcdir)/src/gudev/gudevenumerator.c
+
+INTROSPECTION_GIRS = src/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
+ src/gudev/GUdev-1.0.gir
typelibsdir = $(libdir)/girepository-1.0
typelibs_DATA = \
- src/udev/gudev/GUdev-1.0.typelib
+ src/gudev/GUdev-1.0.typelib
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif # ENABLE_INTROSPECTION
+endif # HAVE_INTROSPECTION
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libgudev-install-move-hook:
keymap_CPPFLAGS = \
$(AM_CPPFLAGS) -I src/udev/keymap
+keymap_LDADD = \
+ libsystemd-shared.la
+
nodist_keymap_SOURCES = \
src/udev/keymap/keys-from-name.h \
src/udev/keymap/keys-to-name.h
src/udev/keymap/findkeyboards \
src/udev/keymap/keyboard-force-release.sh
+TESTS += \
+ src/udev/keymap/check-keymaps.sh
+
EXTRA_DIST += \
src/udev/keymap/check-keymaps.sh
udevkeymapdir = $(libexecdir)/udev/keymaps
dist_udevkeymap_DATA = \
- src/udev/keymap/keymaps/acer \
- src/udev/keymap/keymaps/acer-aspire_5720 \
- src/udev/keymap/keymaps/acer-aspire_8930 \
- src/udev/keymap/keymaps/acer-aspire_5920g \
- src/udev/keymap/keymaps/acer-aspire_6920 \
- src/udev/keymap/keymaps/acer-travelmate_c300 \
- src/udev/keymap/keymaps/asus \
- src/udev/keymap/keymaps/compaq-e_evo \
- src/udev/keymap/keymaps/dell \
- src/udev/keymap/keymaps/dell-latitude-xt2 \
- src/udev/keymap/keymaps/everex-xt5000 \
- src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \
- src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \
- src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
- src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \
- src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \
- src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
- src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
- src/udev/keymap/keymaps/genius-slimstar-320 \
- src/udev/keymap/keymaps/hewlett-packard \
- src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \
- src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \
- src/udev/keymap/keymaps/hewlett-packard-pavilion \
- src/udev/keymap/keymaps/hewlett-packard-presario-2100 \
- src/udev/keymap/keymaps/hewlett-packard-tablet \
- src/udev/keymap/keymaps/hewlett-packard-tx2 \
- src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
- src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \
- src/udev/keymap/keymaps/lenovo-3000 \
- src/udev/keymap/keymaps/lenovo-ideapad \
- src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
- src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \
- src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \
- src/udev/keymap/keymaps/lg-x110 \
- src/udev/keymap/keymaps/logitech-wave \
- src/udev/keymap/keymaps/logitech-wave-cordless \
- src/udev/keymap/keymaps/logitech-wave-pro-cordless \
- src/udev/keymap/keymaps/maxdata-pro_7000 \
- src/udev/keymap/keymaps/medion-fid2060 \
- src/udev/keymap/keymaps/medionnb-a555 \
- src/udev/keymap/keymaps/micro-star \
- src/udev/keymap/keymaps/module-asus-w3j \
- src/udev/keymap/keymaps/module-ibm \
- src/udev/keymap/keymaps/module-lenovo \
- src/udev/keymap/keymaps/module-sony \
- src/udev/keymap/keymaps/module-sony-old \
- src/udev/keymap/keymaps/module-sony-vgn \
- src/udev/keymap/keymaps/olpc-xo \
- src/udev/keymap/keymaps/onkyo \
- src/udev/keymap/keymaps/oqo-model2 \
- src/udev/keymap/keymaps/samsung-other \
- src/udev/keymap/keymaps/samsung-90x3a \
- src/udev/keymap/keymaps/samsung-sq1us \
- src/udev/keymap/keymaps/samsung-sx20s \
- src/udev/keymap/keymaps/toshiba-satellite_a100 \
- src/udev/keymap/keymaps/toshiba-satellite_a110 \
- src/udev/keymap/keymaps/toshiba-satellite_m30x \
- src/udev/keymap/keymaps/zepto-znote
+ keymaps/acer \
+ keymaps/acer-aspire_5720 \
+ keymaps/acer-aspire_8930 \
+ keymaps/acer-aspire_5920g \
+ keymaps/acer-aspire_6920 \
+ keymaps/acer-travelmate_c300 \
+ keymaps/asus \
+ keymaps/compaq-e_evo \
+ keymaps/dell \
+ keymaps/dell-latitude-xt2 \
+ keymaps/everex-xt5000 \
+ keymaps/fujitsu-amilo_li_2732 \
+ keymaps/fujitsu-amilo_pa_2548 \
+ keymaps/fujitsu-amilo_pro_edition_v3505 \
+ keymaps/fujitsu-amilo_pro_v3205 \
+ keymaps/fujitsu-amilo_si_1520 \
+ keymaps/fujitsu-esprimo_mobile_v5 \
+ keymaps/fujitsu-esprimo_mobile_v6 \
+ keymaps/genius-slimstar-320 \
+ keymaps/hewlett-packard \
+ keymaps/hewlett-packard-2510p_2530p \
+ keymaps/hewlett-packard-compaq_elitebook \
+ keymaps/hewlett-packard-pavilion \
+ keymaps/hewlett-packard-presario-2100 \
+ keymaps/hewlett-packard-tablet \
+ keymaps/hewlett-packard-tx2 \
+ keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+ keymaps/inventec-symphony_6.0_7.0 \
+ keymaps/lenovo-3000 \
+ keymaps/lenovo-ideapad \
+ keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+ keymaps/lenovo-thinkpad_x6_tablet \
+ keymaps/lenovo-thinkpad_x200_tablet \
+ keymaps/lg-x110 \
+ keymaps/logitech-wave \
+ keymaps/logitech-wave-cordless \
+ keymaps/logitech-wave-pro-cordless \
+ keymaps/maxdata-pro_7000 \
+ keymaps/medion-fid2060 \
+ keymaps/medionnb-a555 \
+ keymaps/micro-star \
+ keymaps/module-asus-w3j \
+ keymaps/module-ibm \
+ keymaps/module-lenovo \
+ keymaps/module-sony \
+ keymaps/module-sony-old \
+ keymaps/module-sony-vgn \
+ keymaps/olpc-xo \
+ keymaps/onkyo \
+ keymaps/oqo-model2 \
+ keymaps/samsung-other \
+ keymaps/samsung-90x3a \
+ keymaps/samsung-sq1us \
+ keymaps/samsung-sx20s \
+ keymaps/toshiba-satellite_a100 \
+ keymaps/toshiba-satellite_a110 \
+ keymaps/toshiba-satellite_m30x \
+ keymaps/zepto-znote
udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
dist_udevkeymapforcerel_DATA = \
- src/udev/keymap/force-release-maps/dell-touchpad \
- src/udev/keymap/force-release-maps/hp-other \
- src/udev/keymap/force-release-maps/samsung-other \
- src/udev/keymap/force-release-maps/samsung-90x3a \
- src/udev/keymap/force-release-maps/common-volume-keys
+ keymaps-force-release/dell-touchpad \
+ keymaps-force-release/dell-xps \
+ keymaps-force-release/hp-other \
+ keymaps-force-release/samsung-other \
+ keymaps-force-release/samsung-90x3a \
+ keymaps-force-release/common-volume-keys
src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
$(AM_V_at)mkdir -p src/udev/keymap
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-keymaps-distcheck-hook: src/udev/keymap/keys.txt
- $(top_srcdir)/src/udev/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS += keymaps-distcheck-hook
endif
# ------------------------------------------------------------------------------
$(AM_CPPFLAGS)
dist_udevrules_DATA += \
- src/udev/mtd_probe/75-probe_mtd.rules
+ rules/75-probe_mtd.rules
udevlibexec_PROGRAMS += \
mtd_probe
noinst_PROGRAMS += \
test-id128
+TESTS += \
+ test-id128
+
pkginclude_HEADERS += \
src/systemd/sd-id128.h
systemd_hostnamed_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
rootlibexec_PROGRAMS += \
systemd-hostnamed
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
nodist_systemunit_DATA += \
units/systemd-localed.service
systemd_timedated_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
rootlibexec_PROGRAMS += \
systemd-timedated
src/login/logind-session.h \
src/login/logind-user.c \
src/login/logind-user.h \
+ src/login/logind-inhibit.c \
+ src/login/logind-inhibit.h \
src/login/logind-session-dbus.c \
src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
- libudev.la \
- $(DBUS_LIBS)
+ libudev.la
if HAVE_ACL
systemd_logind_SOURCES += \
loginctl_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
- libudev.la \
- $(DBUS_LIBS)
+ libudev.la
rootbin_PROGRAMS += \
loginctl
libsystemd-login.la \
libsystemd-shared.la
+test_inhibit_SOURCES = \
+ src/login/test-inhibit.c
+
+test_inhibit_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la
+
+test_inhibit_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
noinst_PROGRAMS += \
- test-login
+ test-login \
+ test-inhibit
libsystemd_login_la_SOURCES = \
src/login/sd-login.c
pam_systemd_la_LIBADD = \
libsystemd-daemon.la \
libsystemd-audit.la \
+ libsystemd-dbus.la \
libsystemd-shared.la \
- $(PAM_LIBS) \
- $(DBUS_LIBS)
+ $(PAM_LIBS)
pamlib_LTLIBRARIES = \
pam_systemd.la
if HAVE_XSLTPROC
XSLTPROC_FLAGS = \
--nonet \
+ --stringparam man.output.quietly 1 \
--stringparam funcsynopsis.style ansi
XSLTPROC_PROCESS_MAN = \
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
-distcheck-hook: $(DISTCHECK_HOOKS)
-
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
+clean-local:
+ rm -rf $(abs_srcdir)/install-tree
+
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootprefix=$$dc_install_base \
- --disable-split-usr \
+ --disable-split-usr
+
+if ENABLE_GTK_DOC
+DISTCHECK_CONFIGURE_FLAGS += \
--enable-gtk-doc
+endif
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
- scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
scp man/*.html tango:public/systemd-man/
+doc-sync: all
+ rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+ rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+ rsync -av man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+install-tree: all
+ rm -rf $(abs_srcdir)/install-tree
+ make install DESTDIR=$(abs_srcdir)/install-tree
+ tree $(abs_srcdir)/install-tree
~ianmdlvl / elogind.git / blobdiff