chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: move source files to subdirectory
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index cf563867f3f64da431d1265b321e213ab6e4680c..0da02af0056edf5812ff6cce2065eb8b4799591e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-33,11
+33,8
@@
AM_CPPFLAGS = \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
- -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
-
-VALA_CFLAGS = \
- -Wno-unused-variable \
- -Wno-unused-function
+ -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\" \
+ -I $(top_srcdir)/src
sbin_PROGRAMS = \
systemd
sbin_PROGRAMS = \
systemd
@@
-86,64
+83,65
@@
EXTRA_DIST = \
# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
BASIC_SOURCES = \
# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
BASIC_SOURCES = \
- util.c \
- hashmap.c \
- set.c \
- strv.c \
- conf-parser.c \
- socket-util.c \
- log.c \
- ratelimit.c
+
src/
util.c \
+
src/
hashmap.c \
+ s
rc/s
et.c \
+ s
rc/s
trv.c \
+
src/
conf-parser.c \
+ s
rc/s
ocket-util.c \
+
src/
log.c \
+
src/
ratelimit.c
COMMON_SOURCES = \
$(BASIC_SOURCES) \
COMMON_SOURCES = \
$(BASIC_SOURCES) \
- unit.c \
- job.c \
- manager.c \
- load-fragment.c \
- service.c \
- automount.c \
- mount.c \
- swap.c \
- device.c \
- target.c \
- snapshot.c \
- socket.c \
- timer.c \
- load-dropin.c \
- execute.c \
- dbus.c \
- dbus-manager.c \
- dbus-unit.c \
- dbus-job.c \
- dbus-service.c \
- dbus-socket.c \
- dbus-target.c \
- dbus-mount.c \
- dbus-automount.c \
- dbus-swap.c \
- dbus-snapshot.c \
- dbus-device.c \
- dbus-execute.c \
- cgroup.c \
- mount-setup.c \
- hostname-setup.c \
- loopback-setup.c \
- utmp-wtmp.c \
- specifier.c \
- unit-name.c \
- fdset.c \
- namespace.c
+
src/
unit.c \
+
src/
job.c \
+
src/
manager.c \
+
src/
load-fragment.c \
+ s
rc/s
ervice.c \
+
src/
automount.c \
+
src/
mount.c \
+ s
rc/s
wap.c \
+
src/
device.c \
+
src/
target.c \
+ s
rc/s
napshot.c \
+ s
rc/s
ocket.c \
+
src/
timer.c \
+
src/
load-dropin.c \
+
src/
execute.c \
+
src/
dbus.c \
+
src/
dbus-manager.c \
+
src/
dbus-unit.c \
+
src/
dbus-job.c \
+
src/
dbus-service.c \
+
src/
dbus-socket.c \
+
src/
dbus-target.c \
+
src/
dbus-mount.c \
+
src/
dbus-automount.c \
+
src/
dbus-swap.c \
+
src/
dbus-snapshot.c \
+
src/
dbus-device.c \
+
src/
dbus-execute.c \
+
src/
cgroup.c \
+
src/
mount-setup.c \
+
src/
hostname-setup.c \
+
src/
loopback-setup.c \
+
src/
utmp-wtmp.c \
+ s
rc/s
pecifier.c \
+
src/
unit-name.c \
+
src/
fdset.c \
+
src/
namespace.c
EXTRA_DIST += \
${COMMON_SOURCES:.c=.h} \
EXTRA_DIST += \
${COMMON_SOURCES:.c=.h} \
- macro.h \
- ioprio.h \
- missing.h \
- list.h \
- securebits.h \
- linux/auto_dev-ioctl.h \
- initreq.h
+ src/macro.h \
+ src/ioprio.h \
+ src/missing.h \
+ src/list.h \
+ src/securebits.h \
+ src/linux/auto_dev-ioctl.h \
+ src/initreq.h \
+ src/sd-daemon.h
dist_man_MANS = \
systemd.unit.5 \
dist_man_MANS = \
systemd.unit.5 \
@@
-162,7
+160,7
@@
EXTRA_DIST += \
systemd_SOURCES = \
$(COMMON_SOURCES) \
systemd_SOURCES = \
$(COMMON_SOURCES) \
- main.c
+
src/
main.c
systemd_CPPFLAGS = \
$(AM_CPPFLAGS) \
systemd_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@
-177,45
+175,43
@@
systemd_LDADD = \
test_engine_SOURCES = \
$(COMMON_SOURCES) \
test_engine_SOURCES = \
$(COMMON_SOURCES) \
- test-engine.c
+
src/
test-engine.c
test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
- test-engine.c
+
src/
test-engine.c
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
test_job_type_LDADD = $(systemd_LDADD)
test_ns_SOURCES = \
$(BASIC_SOURCES) \
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
test_job_type_LDADD = $(systemd_LDADD)
test_ns_SOURCES = \
$(BASIC_SOURCES) \
- test-ns.c \
- namespace.c
+
src/
test-ns.c \
+
src/
namespace.c
test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
test_ns_LDADD = $(systemd_LDADD)
test_loopback_SOURCES = \
$(BASIC_SOURCES) \
test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
test_ns_LDADD = $(systemd_LDADD)
test_loopback_SOURCES = \
$(BASIC_SOURCES) \
- test-loopback.c \
- loopback-setup.c
+
src/
test-loopback.c \
+
src/
loopback-setup.c
test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
test_loopback_LDADD = $(systemd_LDADD)
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
test_loopback_LDADD = $(systemd_LDADD)
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
- logger.c \
- sd-daemon.c \
- sd-daemon.h
+ src/logger.c \
+ src/sd-daemon.c
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
- initctl.c \
- sd-daemon.c \
- sd-daemon.h
+ src/initctl.c \
+ src/sd-daemon.c
systemd_initctl_CPPFLAGS = \
$(AM_CPPFLAGS) \
systemd_initctl_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@
-226,7
+222,7
@@
systemd_initctl_LDADD = \
systemd_cgroups_agent_SOURCES = \
$(BASIC_SOURCES) \
systemd_cgroups_agent_SOURCES = \
$(BASIC_SOURCES) \
- cgroups-agent.c
+
src/
cgroups-agent.c
systemd_cgroups_agent_CPPFLAGS = \
$(AM_CPPFLAGS) \
systemd_cgroups_agent_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@
-235,36
+231,49
@@
systemd_cgroups_agent_CPPFLAGS = \
systemd_cgroups_agent_LDADD = \
$(DBUS_LIBS)
systemd_cgroups_agent_LDADD = \
$(DBUS_LIBS)
-VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gtk+-2.0
+VALAFLAGS = \
+ -g \
+ --save-temps \
+ --pkg=dbus-glib-1 \
+ --pkg=posix
+
+if HAVE_GTK
+VALAFLAGS += \
+ --pkg=gtk+-2.0
+endif
+
+VALA_CFLAGS = \
+ -Wno-unused-variable \
+ -Wno-unused-function
systemctl_SOURCES = \
systemctl_SOURCES = \
- systemctl.vala \
- systemd-interfaces.vala
+ s
rc/s
ystemctl.vala \
+ s
rc/s
ystemd-interfaces.vala
systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
systemctl_LDADD = $(DBUSGLIB_LIBS)
systemadm_SOURCES = \
systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
systemctl_LDADD = $(DBUSGLIB_LIBS)
systemadm_SOURCES = \
- systemadm.vala \
- systemd-interfaces.vala
+ s
rc/s
ystemadm.vala \
+ s
rc/s
ystemd-interfaces.vala
systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
systemd-initctl.service: units/systemd-initctl.service.in Makefile
systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
systemd-initctl.service: units/systemd-initctl.service.in Makefile
-
sed
-e 's,@libexecdir\@,$(libexecdir),g' \
+
$(SED)
-e 's,@libexecdir\@,$(libexecdir),g' \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
systemd-logger.service: units/systemd-logger.service.in Makefile
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
systemd-logger.service: units/systemd-logger.service.in Makefile
-
sed
-e 's,@libexecdir\@,$(libexecdir),g' \
+
$(SED)
-e 's,@libexecdir\@,$(libexecdir),g' \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
CLEANFILES = \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
CLEANFILES = \
- systemd-interfaces.c \
- systemctl.c \
- systemadm.c \
+ s
rc/s
ystemd-interfaces.c \
+ s
rc/s
ystemctl.c \
+ s
rc/s
ystemadm.c \
systemd-initctl.service \
systemd-logger.service
systemd-initctl.service \
systemd-logger.service
@@
-288,8
+297,9
@@
install-data-hook:
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd \
$(DESTDIR)/cgroup/debug
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd \
$(DESTDIR)/cgroup/debug
- rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
- ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+ ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
+ rm -f session && \
+ $(LN_S) $(DESTDIR)$(pkgsysconfdir)/session session )
DISTCHECK_CONFIGURE_FLAGS = \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
DISTCHECK_CONFIGURE_FLAGS = \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)