main: fix help regarding --unit/systemd.unit=

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b255b7a1f6881e0e7a15fddaa5ba4c08f6b4bb0a..d8757868e85b7bc90d10d39a6c30a73115bb062d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,11 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Dirs of external packages
-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+dbuspolicydir=@dbuspolicydir@
+dbussessionservicedir=@dbussessionservicedir@
+dbussystemservicedir=@dbussystemservicedir@
+dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
-interfacedir=$(datadir)/dbus-1/interfaces
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -48,8 +50,11 @@ rootbin_PROGRAMS = \
        systemd \
        systemctl
 
-if HAVE_GTK
 bin_PROGRAMS = \
+       systemd-install
+
+if HAVE_GTK
+bin_PROGRAMS += \
        systemadm
 endif
 
@@ -67,10 +72,13 @@ noinst_PROGRAMS = \
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf
 
+dist_dbussystemservice_DATA = \
+       src/org.freedesktop.systemd1.service
+
 dist_udevrules_DATA = \
        src/99-systemd.rules
 
-interface_DATA = \
+dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
        org.freedesktop.systemd1.Job.xml \
        org.freedesktop.systemd1.Unit.xml \
@@ -87,6 +95,7 @@ interface_DATA = \
 
 dist_systemunit_DATA = \
        units/emergency.service \
+       units/basic.target \
        units/getty.target \
        units/halt.target \
        units/local-fs.target \
@@ -119,7 +128,7 @@ dist_systemunit_DATA = \
        units/var-run.mount
 
 systemunit_DATA = \
-       units/basic.target \
+       units/sysinit.target \
        units/getty@.service \
        units/graphical.target \
        units/multi-user.target \
@@ -135,7 +144,7 @@ sessionunit_DATA = \
        units/session/exit.service
 
 EXTRA_DIST = \
-       units/basic.target.m4 \
+       units/sysinit.target.m4 \
        units/getty@.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
@@ -193,6 +202,7 @@ COMMON_SOURCES = \
        src/unit.c \
         src/job.c \
         src/manager.c \
+       src/path-lookup.c \
         src/load-fragment.c \
         src/service.c \
         src/automount.c \
@@ -268,8 +278,8 @@ systemd_SOURCES = \
        $(COMMON_SOURCES) \
        src/main.c
 
-systemd_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
+systemd_CFLAGS = \
+       $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
        $(UDEV_CFLAGS) \
        $(CGROUP_CFLAGS)
@@ -283,14 +293,14 @@ test_engine_SOURCES = \
        $(COMMON_SOURCES) \
        src/test-engine.c
 
-test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
+test_engine_CFLAGS = $(systemd_CFLAGS)
 test_engine_LDADD = $(systemd_LDADD)
 
 test_job_type_SOURCES = \
        $(COMMON_SOURCES) \
        src/test-job-type.c
 
-test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
+test_job_type_CFLAGS = $(systemd_CFLAGS)
 test_job_type_LDADD = $(systemd_LDADD)
 
 test_ns_SOURCES = \
@@ -298,7 +308,7 @@ test_ns_SOURCES = \
        src/test-ns.c \
        src/namespace.c
 
-test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
+test_ns_CFLAGS = $(systemd_CFLAGS)
 test_ns_LDADD = $(systemd_LDADD)
 
 test_loopback_SOURCES = \
@@ -306,7 +316,7 @@ test_loopback_SOURCES = \
        src/test-loopback.c \
        src/loopback-setup.c
 
-test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
+test_loopback_CFLAGS = $(systemd_CFLAGS)
 test_loopback_LDADD = $(systemd_LDADD)
 
 systemd_logger_SOURCES = \
@@ -319,8 +329,8 @@ systemd_initctl_SOURCES = \
        src/initctl.c \
        src/sd-daemon.c
 
-systemd_initctl_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
+systemd_initctl_CFLAGS = \
+       $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 systemd_initctl_LDADD = \
@@ -330,40 +340,47 @@ systemd_cgroups_agent_SOURCES = \
        $(BASIC_SOURCES) \
        src/cgroups-agent.c
 
-systemd_cgroups_agent_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
+systemd_cgroups_agent_CFLAGS = \
+       $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 systemd_cgroups_agent_LDADD = \
        $(DBUS_LIBS)
 
-VALAFLAGS = \
-       -g \
-       --save-temps \
-       --pkg=dbus-glib-1 \
-       --pkg=posix
-
-if HAVE_GTK
-VALAFLAGS += \
-       --pkg=gtk+-2.0
-endif
+systemctl_SOURCES = \
+       src/systemctl.c \
+       $(BASIC_SOURCES)
 
-VALA_CFLAGS = \
-       -Wno-unused-variable \
-       -Wno-unused-function
+systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+systemctl_LDADD = $(DBUS_LIBS)
 
-systemctl_SOURCES = \
-       src/systemctl.vala \
-       src/systemd-interfaces.vala
+systemd_install_SOURCES = \
+       src/install.c \
+       src/path-lookup.c \
+       $(BASIC_SOURCES)
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
-systemctl_LDADD = $(DBUSGLIB_LIBS)
+# 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_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 = \
@@ -398,7 +415,7 @@ CLEANFILES = \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/syslog.target \
-       units/basic.target \
+       units/sysinit.target \
        units/getty@.service \
        units/graphical.target \
        units/multi-user.target \
@@ -411,7 +428,6 @@ CLEANFILES = \
 if HAVE_VALAC
 CLEANFILES += \
        src/systemd-interfaces.c \
-       src/systemctl.c \
        src/systemadm.c
 endif
 
@@ -463,14 +479,14 @@ endif
 org.freedesktop.systemd1.%.xml: systemd
        $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
 
-CLEANFILES += $(interface_DATA)
+CLEANFILES += $(dbusinterface_DATA)
 
 install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
-               $(DESTDIR)$(systemunitdir)/basic.target.wants \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@ -516,9 +532,10 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f getty.target && \
-               $(LN_S) $(systemunitdir)/getty.target getty.target )
-       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+               rm -f getty.target remote-fs.target && \
+               $(LN_S) $(systemunitdir)/getty.target getty.target && \
+               $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
@@ -529,6 +546,9 @@ install-data-hook:
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
                $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
+       ( cd $(DESTDIR)$(dbussessionservicedir) && \
+               rm -f org.freedesktop.systemd1.service && \
+               $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
@@ -555,5 +575,9 @@ if TARGET_GENTOO
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
+       --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
+       --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
+       --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
+       --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-rootdir=$$dc_install_base/$(rootdir)