build-sys: move source files to subdirectory
This commit is contained in:
parent
e9da3678fc
commit
e99e38bbdc
166
Makefile.am
166
Makefile.am
|
@ -33,11 +33,8 @@ AM_CPPFLAGS = \
|
||||||
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
|
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
|
||||||
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
|
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
|
||||||
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
|
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
|
||||||
-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
|
-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\" \
|
||||||
|
-I $(top_srcdir)/src
|
||||||
VALA_CFLAGS = \
|
|
||||||
-Wno-unused-variable \
|
|
||||||
-Wno-unused-function
|
|
||||||
|
|
||||||
sbin_PROGRAMS = \
|
sbin_PROGRAMS = \
|
||||||
systemd
|
systemd
|
||||||
|
@ -86,65 +83,65 @@ EXTRA_DIST = \
|
||||||
# rules for C programs, but not Vala programs. We therefore can't
|
# 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.
|
# list the .h files as dependencies if we want make dist to work.
|
||||||
BASIC_SOURCES = \
|
BASIC_SOURCES = \
|
||||||
util.c \
|
src/util.c \
|
||||||
hashmap.c \
|
src/hashmap.c \
|
||||||
set.c \
|
src/set.c \
|
||||||
strv.c \
|
src/strv.c \
|
||||||
conf-parser.c \
|
src/conf-parser.c \
|
||||||
socket-util.c \
|
src/socket-util.c \
|
||||||
log.c \
|
src/log.c \
|
||||||
ratelimit.c
|
src/ratelimit.c
|
||||||
|
|
||||||
COMMON_SOURCES = \
|
COMMON_SOURCES = \
|
||||||
$(BASIC_SOURCES) \
|
$(BASIC_SOURCES) \
|
||||||
unit.c \
|
src/unit.c \
|
||||||
job.c \
|
src/job.c \
|
||||||
manager.c \
|
src/manager.c \
|
||||||
load-fragment.c \
|
src/load-fragment.c \
|
||||||
service.c \
|
src/service.c \
|
||||||
automount.c \
|
src/automount.c \
|
||||||
mount.c \
|
src/mount.c \
|
||||||
swap.c \
|
src/swap.c \
|
||||||
device.c \
|
src/device.c \
|
||||||
target.c \
|
src/target.c \
|
||||||
snapshot.c \
|
src/snapshot.c \
|
||||||
socket.c \
|
src/socket.c \
|
||||||
timer.c \
|
src/timer.c \
|
||||||
load-dropin.c \
|
src/load-dropin.c \
|
||||||
execute.c \
|
src/execute.c \
|
||||||
dbus.c \
|
src/dbus.c \
|
||||||
dbus-manager.c \
|
src/dbus-manager.c \
|
||||||
dbus-unit.c \
|
src/dbus-unit.c \
|
||||||
dbus-job.c \
|
src/dbus-job.c \
|
||||||
dbus-service.c \
|
src/dbus-service.c \
|
||||||
dbus-socket.c \
|
src/dbus-socket.c \
|
||||||
dbus-target.c \
|
src/dbus-target.c \
|
||||||
dbus-mount.c \
|
src/dbus-mount.c \
|
||||||
dbus-automount.c \
|
src/dbus-automount.c \
|
||||||
dbus-swap.c \
|
src/dbus-swap.c \
|
||||||
dbus-snapshot.c \
|
src/dbus-snapshot.c \
|
||||||
dbus-device.c \
|
src/dbus-device.c \
|
||||||
dbus-execute.c \
|
src/dbus-execute.c \
|
||||||
cgroup.c \
|
src/cgroup.c \
|
||||||
mount-setup.c \
|
src/mount-setup.c \
|
||||||
hostname-setup.c \
|
src/hostname-setup.c \
|
||||||
loopback-setup.c \
|
src/loopback-setup.c \
|
||||||
utmp-wtmp.c \
|
src/utmp-wtmp.c \
|
||||||
specifier.c \
|
src/specifier.c \
|
||||||
unit-name.c \
|
src/unit-name.c \
|
||||||
fdset.c \
|
src/fdset.c \
|
||||||
namespace.c
|
src/namespace.c
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
${COMMON_SOURCES:.c=.h} \
|
${COMMON_SOURCES:.c=.h} \
|
||||||
macro.h \
|
src/macro.h \
|
||||||
ioprio.h \
|
src/ioprio.h \
|
||||||
missing.h \
|
src/missing.h \
|
||||||
list.h \
|
src/list.h \
|
||||||
securebits.h \
|
src/securebits.h \
|
||||||
linux/auto_dev-ioctl.h \
|
src/linux/auto_dev-ioctl.h \
|
||||||
initreq.h \
|
src/initreq.h \
|
||||||
sd-daemon.h
|
src/sd-daemon.h
|
||||||
|
|
||||||
dist_man_MANS = \
|
dist_man_MANS = \
|
||||||
systemd.unit.5 \
|
systemd.unit.5 \
|
||||||
|
@ -163,7 +160,7 @@ EXTRA_DIST += \
|
||||||
|
|
||||||
systemd_SOURCES = \
|
systemd_SOURCES = \
|
||||||
$(COMMON_SOURCES) \
|
$(COMMON_SOURCES) \
|
||||||
main.c
|
src/main.c
|
||||||
|
|
||||||
systemd_CPPFLAGS = \
|
systemd_CPPFLAGS = \
|
||||||
$(AM_CPPFLAGS) \
|
$(AM_CPPFLAGS) \
|
||||||
|
@ -178,43 +175,43 @@ systemd_LDADD = \
|
||||||
|
|
||||||
test_engine_SOURCES = \
|
test_engine_SOURCES = \
|
||||||
$(COMMON_SOURCES) \
|
$(COMMON_SOURCES) \
|
||||||
test-engine.c
|
src/test-engine.c
|
||||||
|
|
||||||
test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
|
test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
|
||||||
test_engine_LDADD = $(systemd_LDADD)
|
test_engine_LDADD = $(systemd_LDADD)
|
||||||
|
|
||||||
test_job_type_SOURCES = \
|
test_job_type_SOURCES = \
|
||||||
$(COMMON_SOURCES) \
|
$(COMMON_SOURCES) \
|
||||||
test-engine.c
|
src/test-engine.c
|
||||||
|
|
||||||
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
|
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
|
||||||
test_job_type_LDADD = $(systemd_LDADD)
|
test_job_type_LDADD = $(systemd_LDADD)
|
||||||
|
|
||||||
test_ns_SOURCES = \
|
test_ns_SOURCES = \
|
||||||
$(BASIC_SOURCES) \
|
$(BASIC_SOURCES) \
|
||||||
test-ns.c \
|
src/test-ns.c \
|
||||||
namespace.c
|
src/namespace.c
|
||||||
|
|
||||||
test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
|
test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
|
||||||
test_ns_LDADD = $(systemd_LDADD)
|
test_ns_LDADD = $(systemd_LDADD)
|
||||||
|
|
||||||
test_loopback_SOURCES = \
|
test_loopback_SOURCES = \
|
||||||
$(BASIC_SOURCES) \
|
$(BASIC_SOURCES) \
|
||||||
test-loopback.c \
|
src/test-loopback.c \
|
||||||
loopback-setup.c
|
src/loopback-setup.c
|
||||||
|
|
||||||
test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
|
test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
|
||||||
test_loopback_LDADD = $(systemd_LDADD)
|
test_loopback_LDADD = $(systemd_LDADD)
|
||||||
|
|
||||||
systemd_logger_SOURCES = \
|
systemd_logger_SOURCES = \
|
||||||
$(BASIC_SOURCES) \
|
$(BASIC_SOURCES) \
|
||||||
logger.c \
|
src/logger.c \
|
||||||
sd-daemon.c
|
src/sd-daemon.c
|
||||||
|
|
||||||
systemd_initctl_SOURCES = \
|
systemd_initctl_SOURCES = \
|
||||||
$(BASIC_SOURCES) \
|
$(BASIC_SOURCES) \
|
||||||
initctl.c \
|
src/initctl.c \
|
||||||
sd-daemon.c
|
src/sd-daemon.c
|
||||||
|
|
||||||
systemd_initctl_CPPFLAGS = \
|
systemd_initctl_CPPFLAGS = \
|
||||||
$(AM_CPPFLAGS) \
|
$(AM_CPPFLAGS) \
|
||||||
|
@ -225,7 +222,7 @@ systemd_initctl_LDADD = \
|
||||||
|
|
||||||
systemd_cgroups_agent_SOURCES = \
|
systemd_cgroups_agent_SOURCES = \
|
||||||
$(BASIC_SOURCES) \
|
$(BASIC_SOURCES) \
|
||||||
cgroups-agent.c
|
src/cgroups-agent.c
|
||||||
|
|
||||||
systemd_cgroups_agent_CPPFLAGS = \
|
systemd_cgroups_agent_CPPFLAGS = \
|
||||||
$(AM_CPPFLAGS) \
|
$(AM_CPPFLAGS) \
|
||||||
|
@ -234,18 +231,31 @@ systemd_cgroups_agent_CPPFLAGS = \
|
||||||
systemd_cgroups_agent_LDADD = \
|
systemd_cgroups_agent_LDADD = \
|
||||||
$(DBUS_LIBS)
|
$(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 \
|
src/systemctl.vala \
|
||||||
systemd-interfaces.vala
|
src/systemd-interfaces.vala
|
||||||
|
|
||||||
systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
|
systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
|
||||||
systemctl_LDADD = $(DBUSGLIB_LIBS)
|
systemctl_LDADD = $(DBUSGLIB_LIBS)
|
||||||
|
|
||||||
systemadm_SOURCES = \
|
systemadm_SOURCES = \
|
||||||
systemadm.vala \
|
src/systemadm.vala \
|
||||||
systemd-interfaces.vala
|
src/systemd-interfaces.vala
|
||||||
|
|
||||||
systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
|
systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
|
||||||
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
|
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
|
||||||
|
@ -261,9 +271,9 @@ systemd-logger.service: units/systemd-logger.service.in Makefile
|
||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
||||||
CLEANFILES = \
|
CLEANFILES = \
|
||||||
systemd-interfaces.c \
|
src/systemd-interfaces.c \
|
||||||
systemctl.c \
|
src/systemctl.c \
|
||||||
systemadm.c \
|
src/systemadm.c \
|
||||||
systemd-initctl.service \
|
systemd-initctl.service \
|
||||||
systemd-logger.service
|
systemd-logger.service
|
||||||
|
|
||||||
|
|
|
@ -18,11 +18,11 @@
|
||||||
AC_PREREQ(2.63)
|
AC_PREREQ(2.63)
|
||||||
|
|
||||||
AC_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org])
|
AC_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org])
|
||||||
AC_CONFIG_SRCDIR([main.c])
|
AC_CONFIG_SRCDIR([src/main.c])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
|
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects])
|
||||||
|
|
||||||
AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])
|
AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue