chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo: the correct spelling is maintenance not maintainance
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 20fd06f8267cf827c2d36923d56c3dfe296a8c62..e50ae82040655c6e25b0b2ef1267d774cd04d9b9 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-50,8
+50,11
@@
rootbin_PROGRAMS = \
systemd \
systemctl
systemd \
systemctl
-if HAVE_GTK
bin_PROGRAMS = \
bin_PROGRAMS = \
+ systemd-install
+
+if HAVE_GTK
+bin_PROGRAMS += \
systemadm
endif
systemadm
endif
@@
-64,7
+67,8
@@
noinst_PROGRAMS = \
test-engine \
test-job-type \
test-ns \
test-engine \
test-job-type \
test-ns \
- test-loopback
+ test-loopback \
+ test-daemon
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
@@
-275,8
+279,8
@@
systemd_SOURCES = \
$(COMMON_SOURCES) \
src/main.c
$(COMMON_SOURCES) \
src/main.c
-systemd_C
PP
FLAGS = \
- $(AM_C
PP
FLAGS) \
+systemd_CFLAGS = \
+ $(AM_CFLAGS) \
$(DBUS_CFLAGS) \
$(UDEV_CFLAGS) \
$(CGROUP_CFLAGS)
$(DBUS_CFLAGS) \
$(UDEV_CFLAGS) \
$(CGROUP_CFLAGS)
@@
-290,14
+294,14
@@
test_engine_SOURCES = \
$(COMMON_SOURCES) \
src/test-engine.c
$(COMMON_SOURCES) \
src/test-engine.c
-test_engine_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_engine_C
FLAGS = $(systemd_C
FLAGS)
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
src/test-job-type.c
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
src/test-job-type.c
-test_job_type_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_job_type_C
FLAGS = $(systemd_C
FLAGS)
test_job_type_LDADD = $(systemd_LDADD)
test_ns_SOURCES = \
test_job_type_LDADD = $(systemd_LDADD)
test_ns_SOURCES = \
@@
-305,7
+309,7
@@
test_ns_SOURCES = \
src/test-ns.c \
src/namespace.c
src/test-ns.c \
src/namespace.c
-test_ns_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_ns_C
FLAGS = $(systemd_C
FLAGS)
test_ns_LDADD = $(systemd_LDADD)
test_loopback_SOURCES = \
test_ns_LDADD = $(systemd_LDADD)
test_loopback_SOURCES = \
@@
-313,8
+317,10
@@
test_loopback_SOURCES = \
src/test-loopback.c \
src/loopback-setup.c
src/test-loopback.c \
src/loopback-setup.c
-test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
-test_loopback_LDADD = $(systemd_LDADD)
+test_daemon_SOURCES = \
+ $(BASIC_SOURCES) \
+ src/test-daemon.c \
+ src/sd-daemon.c
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
@@
-326,8
+332,8
@@
systemd_initctl_SOURCES = \
src/initctl.c \
src/sd-daemon.c
src/initctl.c \
src/sd-daemon.c
-systemd_initctl_C
PP
FLAGS = \
- $(AM_C
PP
FLAGS) \
+systemd_initctl_CFLAGS = \
+ $(AM_CFLAGS) \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
@@
-337,8
+343,8
@@
systemd_cgroups_agent_SOURCES = \
$(BASIC_SOURCES) \
src/cgroups-agent.c
$(BASIC_SOURCES) \
src/cgroups-agent.c
-systemd_cgroups_agent_C
PP
FLAGS = \
- $(AM_C
PP
FLAGS) \
+systemd_cgroups_agent_CFLAGS = \
+ $(AM_CFLAGS) \
$(DBUS_CFLAGS)
systemd_cgroups_agent_LDADD = \
$(DBUS_CFLAGS)
systemd_cgroups_agent_LDADD = \
@@
-348,29
+354,36
@@
systemctl_SOURCES = \
src/systemctl.c \
$(BASIC_SOURCES)
src/systemctl.c \
$(BASIC_SOURCES)
-systemctl_C
PPFLAGS = $(AM_CPP
FLAGS) $(DBUS_CFLAGS)
+systemctl_C
FLAGS = $(AM_C
FLAGS) $(DBUS_CFLAGS)
systemctl_LDADD = $(DBUS_LIBS)
systemctl_LDADD = $(DBUS_LIBS)
-VALAFLAGS = \
- -g \
- --save-temps \
- --pkg=dbus-glib-1 \
- --pkg=posix
-
-if HAVE_GTK
-VALAFLAGS += \
- --pkg=gtk+-2.0
-endif
+systemd_install_SOURCES = \
+ src/install.c \
+ src/path-lookup.c \
+ $(BASIC_SOURCES)
-VALA_CFLAGS = \
- -Wno-unused-variable \
- -Wno-unused-function
+# We don't really link here against D-Bus, however we indirectly include D-Bus header files
+systemd_install_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
systemadm_SOURCES = \
src/systemadm.vala \
src/systemd-interfaces.vala
systemadm_SOURCES = \
src/systemadm.vala \
src/systemd-interfaces.vala
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
+systemadm_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUSGLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ -Wno-unused-variable \
+ -Wno-unused-function \
+ -Wno-shadow \
+ -Wno-format-nonliteral
+
+systemadm_VALAFLAGS = \
+ --pkg=dbus-glib-1 \
+ --pkg=posix \
+ --pkg=gtk+-2.0 \
+ -g
+
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
SED_PROCESS = \
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
SED_PROCESS = \