chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: properly generate session units
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 973c08e4cee4a4a6fa08e7d056c3ac8946a059c4..3b54699afd1d46c4975951745ea7c66d5f401841 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-93,6
+93,9
@@
systemunit_DATA = \
units/systemd-logger.service \
units/syslog.target
units/systemd-logger.service \
units/syslog.target
+sessionunit_DATA = \
+ units/session/remote-fs.target
+
EXTRA_DIST = \
units/basic.target.m4 \
units/getty@.service.m4 \
EXTRA_DIST = \
units/basic.target.m4 \
units/getty@.service.m4 \
@@
-102,7
+105,8
@@
EXTRA_DIST = \
units/systemd-logger.service.in \
units/syslog.target.in \
LICENSE \
units/systemd-logger.service.in \
units/syslog.target.in \
LICENSE \
- README
+ README \
+ DISTRO_PORTING
if TARGET_FEDORA
dist_systemunit_DATA += \
if TARGET_FEDORA
dist_systemunit_DATA += \
@@
-321,21
+325,31
@@
if TARGET_FEDORA
M4_FLAGS += -DTARGET_FEDORA=1
endif
M4_FLAGS += -DTARGET_FEDORA=1
endif
-M4_PROCESS = \
+M4_PROCESS
_SYSTEM
= \
$(MKDIR_P) units && \
$(MKDIR_P) units && \
- $(M4) -P $(M4_FLAGS) < $< > $@
+ $(M4) -P $(M4_FLAGS) -DFOR_SYSTEM < $< > $@
+
+M4_PROCESS_SESSION = \
+ $(MKDIR_P) units/session && \
+ $(M4) -P $(M4_FLAGS) -DFOR_SESSION < $< > $@
units/basic.target: units/basic.target.m4 Makefile
units/basic.target: units/basic.target.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS
_SYSTEM
)
units/graphical.target: units/graphical.target.m4 Makefile
units/graphical.target: units/graphical.target.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS
_SYSTEM
)
units/multi-user.target: units/multi-user.target.m4 Makefile
units/multi-user.target: units/multi-user.target.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS
_SYSTEM
)
units/getty@.service: units/getty@.service.m4 Makefile
units/getty@.service: units/getty@.service.m4 Makefile
- $(M4_PROCESS)
+ $(M4_PROCESS_SYSTEM)
+
+units/remote-fs.target: units/remote-fs.target.m4 Makefile
+ $(M4_PROCESS_SYSTEM)
+
+units/session/remote-fs.target: units/remote-fs.target.m4 Makefile
+ $(M4_PROCESS_SESSION)
CLEANFILES = \
src/systemd-interfaces.c \
CLEANFILES = \
src/systemd-interfaces.c \
@@
-383,9
+397,11
@@
install-data-hook:
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
( cd $(DESTDIR)$(sessionunitdir) && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
( cd $(DESTDIR)$(sessionunitdir) && \
- rm -f shutdown.target sockets.target && \
+ rm -f shutdown.target sockets.target
local-fs.target swap.target
&& \
$(LN_S) ../system/shutdown.target shutdown.target && \
$(LN_S) ../system/shutdown.target shutdown.target && \
- $(LN_S) ../system/sockets.target sockets.target )
+ $(LN_S) ../system/sockets.target sockets.target && \
+ $(LN_S) ../system/local-fs.target local-fs.target && \
+ $(LN_S) ../system/swap.target swap.target )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel0.target runlevel1.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel0.target runlevel1.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \