Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
systemd
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
steam
systemd
Commits
aa590241
Commit
aa590241
authored
Jan 30, 2013
by
Kay Sievers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build-sys: move most of HAVE_KMOD into one section
parent
4584651a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
33 deletions
+22
-33
Makefile.am
Makefile.am
+22
-33
No files found.
Makefile.am
View file @
aa590241
...
...
@@ -295,11 +295,6 @@ rootlibexec_PROGRAMS = \
systemd-sysctl
\
systemd-sleep
if
HAVE_KMOD
rootlibexec_PROGRAMS
+=
\
systemd-modules-load
endif
systemgenerator_PROGRAMS
=
\
systemd-getty-generator
\
systemd-fstab-generator
\
...
...
@@ -413,14 +408,6 @@ nodist_systemunit_DATA = \
units/systemd-udev-settle.service
\
units/debug-shell.service
if
HAVE_KMOD
nodist_systemunit_DATA
+=
\
units/systemd-modules-load.service
EXTRA_DIST
+=
\
units/systemd-modules-load.service.in
endif
dist_userunit_DATA
=
\
units/user/default.target
\
units/user/exit.target
...
...
@@ -657,15 +644,6 @@ MANPAGES_ALIAS = \
man/SD_JOURNAL_FOREACH_UNIQUE.3
\
man/sd_journal_get_catalog_for_message_id.3
if
HAVE_KMOD
MANPAGES
+=
\
man/modules-load.d.5
\
man/systemd-modules-load.service.8
MANPAGES_ALIAS
+=
\
man/systemd-modules-load.8
man/systemd-modules-load.8
:
man/systemd-modules-load.service.8
endif
if
HAVE_MICROHTTPD
MANPAGES
+=
\
man/systemd-journal-gatewayd.service.8
...
...
@@ -1508,8 +1486,8 @@ systemd_shutdown_LDADD = \
libsystemd-shared.la
\
libudev.la
if
HAVE_KMOD
# ------------------------------------------------------------------------------
if
HAVE_KMOD
systemd_modules_load_SOURCES
=
\
src/modules-load/modules-load.c
...
...
@@ -1520,8 +1498,29 @@ systemd_modules_load_CFLAGS = \
systemd_modules_load_LDADD
=
\
libsystemd-shared.la
\
$(KMOD_LIBS)
rootlibexec_PROGRAMS
+=
\
systemd-modules-load
nodist_systemunit_DATA
+=
\
units/systemd-modules-load.service
SYSINIT_TARGET_WANTS
+=
\
systemd-modules-load.service
dist_udevrules_DATA
+=
\
rules/80-drivers.rules
MANPAGES
+=
\
man/modules-load.d.5
\
man/systemd-modules-load.service.8
MANPAGES_ALIAS
+=
\
man/systemd-modules-load.8
man/systemd-modules-load.8
:
man/systemd-modules-load.service.8
endif
EXTRA_DIST
+=
\
units/systemd-modules-load.service.in
# ------------------------------------------------------------------------------
systemd_tmpfiles_SOURCES
=
\
src/tmpfiles/tmpfiles.c
...
...
@@ -1936,11 +1935,6 @@ dist_udevrules_DATA += \
rules/80-net-name-slot.rules
\
rules/95-udev-late.rules
if
HAVE_KMOD
dist_udevrules_DATA
+=
\
rules/80-drivers.rules
endif
dist_udevhwdb_DATA
=
\
hwdb/20-pci-vendor-product.hwdb
\
hwdb/20-pci-classes.hwdb
\
...
...
@@ -4073,11 +4067,6 @@ INSTALL_DIRS += \
$(dbussessionservicedir)
\
$(sysconfdir)
/xdg/systemd
if
HAVE_KMOD
SYSINIT_TARGET_WANTS
+=
\
systemd-modules-load.service
endif
install-exec-hook
:
$(INSTALL_EXEC_HOOKS)
uninstall-hook
:
$(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment