dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
+check_DATA =
+noinst_PROGRAMS =
TESTS =
AM_CPPFLAGS = \
-I $(top_srcdir)/src/journal \
-I $(top_srcdir)/src/systemd \
-I $(top_srcdir)/src/core \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/libudev
AM_CFLAGS = $(WARNINGFLAGS)
AM_LDFLAGS = $(GCLDFLAGS)
systemd-detect-virt
dist_bin_SCRIPTS = \
- src/systemd-analyze
+ src/analyze/systemd-analyze
rootlibexec_PROGRAMS = \
systemd \
src/core/systemd.pc.in
# ------------------------------------------------------------------------------
-check_PROGRAMS += \
+noinst_PROGRAMS += \
test-engine \
test-job-type \
test-ns \
test-install \
test-watchdog
+TESTS += \
+ test-job-type \
+ test-env-replace \
+ test-strv
+
test_engine_SOURCES = \
src/test/test-engine.c
# ------------------------------------------------------------------------------
SUBDIRS += \
- src/udev/docs
+ docs/libudev
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) \
-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
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
+ src/libudev/libudev-util-private.c \
+ src/libudev/libudev-device-private.c \
+ src/libudev/libudev-queue-private.c
if HAVE_SELINUX
libudev_private_la_SOURCES +=\
- src/udev/libudev-selinux-private.c
+ src/libudev/libudev-selinux-private.c
endif
libudev_private_la_CFLAGS = \
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-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
src/udev/test/udev-test.pl \
src/udev/test/rules-test.sh
-check_PROGRAMS += \
+noinst_PROGRAMS += \
test-libudev \
test-udev
libudev-private.la \
libsystemd-shared.la
-test_udev_DEPENDENCIES = \
+check_DATA += \
src/udev/test/sys
# packed sysfs test tree
EXTRA_DIST += \
src/udev/test/sys.tar.xz \
- src/udev/test/rule-syntax-check.py \
src/udev/test/udev-test.pl \
- src/udev/test/rules-test.sh
+ src/udev/test/rules-test.sh \
+ src/udev/test/rule-syntax-check.py
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_GUDEV
SUBDIRS += \
- src/udev/gudev/docs
+ docs/gudev
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:
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/dell-xps \
src/udev/keymap/force-release-maps/hp-other \
src/udev/keymap/force-release-maps/samsung-other \
src/udev/keymap/force-release-maps/samsung-90x3a \
libsystemd-shared.la \
libsystemd-id128.la
-check_PROGRAMS += \
+noinst_PROGRAMS += \
+ test-id128
+
+TESTS += \
test-id128
pkginclude_HEADERS += \
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
-check_PROGRAMS += \
+noinst_PROGRAMS += \
test-journal \
test-journal-send
libsystemd-login.la \
libsystemd-shared.la
-check_PROGRAMS += \
+noinst_PROGRAMS += \
test-login
libsystemd_login_la_SOURCES = \