chiark / gitweb /
build-sys: move source files to subdirectory
authorLennart Poettering <lennart@poettering.net>
Sun, 16 May 2010 16:45:24 +0000 (18:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 16 May 2010 16:45:24 +0000 (18:45 +0200)
112 files changed:
Makefile.am
configure.ac
src/automount.c [moved from automount.c with 100% similarity]
src/automount.h [moved from automount.h with 100% similarity]
src/cgroup.c [moved from cgroup.c with 100% similarity]
src/cgroup.h [moved from cgroup.h with 100% similarity]
src/cgroups-agent.c [moved from cgroups-agent.c with 100% similarity]
src/conf-parser.c [moved from conf-parser.c with 100% similarity]
src/conf-parser.h [moved from conf-parser.h with 100% similarity]
src/dbus-automount.c [moved from dbus-automount.c with 100% similarity]
src/dbus-automount.h [moved from dbus-automount.h with 100% similarity]
src/dbus-device.c [moved from dbus-device.c with 100% similarity]
src/dbus-device.h [moved from dbus-device.h with 100% similarity]
src/dbus-execute.c [moved from dbus-execute.c with 100% similarity]
src/dbus-execute.h [moved from dbus-execute.h with 100% similarity]
src/dbus-job.c [moved from dbus-job.c with 100% similarity]
src/dbus-job.h [moved from dbus-job.h with 100% similarity]
src/dbus-manager.c [moved from dbus-manager.c with 100% similarity]
src/dbus-manager.h [moved from dbus-manager.h with 100% similarity]
src/dbus-mount.c [moved from dbus-mount.c with 100% similarity]
src/dbus-mount.h [moved from dbus-mount.h with 100% similarity]
src/dbus-service.c [moved from dbus-service.c with 100% similarity]
src/dbus-service.h [moved from dbus-service.h with 100% similarity]
src/dbus-snapshot.c [moved from dbus-snapshot.c with 100% similarity]
src/dbus-snapshot.h [moved from dbus-snapshot.h with 100% similarity]
src/dbus-socket.c [moved from dbus-socket.c with 100% similarity]
src/dbus-socket.h [moved from dbus-socket.h with 100% similarity]
src/dbus-swap.c [moved from dbus-swap.c with 100% similarity]
src/dbus-swap.h [moved from dbus-swap.h with 100% similarity]
src/dbus-target.c [moved from dbus-target.c with 100% similarity]
src/dbus-target.h [moved from dbus-target.h with 100% similarity]
src/dbus-unit.c [moved from dbus-unit.c with 100% similarity]
src/dbus-unit.h [moved from dbus-unit.h with 100% similarity]
src/dbus.c [moved from dbus.c with 100% similarity]
src/dbus.h [moved from dbus.h with 100% similarity]
src/device.c [moved from device.c with 100% similarity]
src/device.h [moved from device.h with 100% similarity]
src/execute.c [moved from execute.c with 100% similarity]
src/execute.h [moved from execute.h with 100% similarity]
src/fdset.c [moved from fdset.c with 100% similarity]
src/fdset.h [moved from fdset.h with 100% similarity]
src/hashmap.c [moved from hashmap.c with 100% similarity]
src/hashmap.h [moved from hashmap.h with 100% similarity]
src/hostname-setup.c [moved from hostname-setup.c with 100% similarity]
src/hostname-setup.h [moved from hostname-setup.h with 100% similarity]
src/initctl.c [moved from initctl.c with 100% similarity]
src/initreq.h [moved from initreq.h with 100% similarity]
src/ioprio.h [moved from ioprio.h with 100% similarity]
src/job.c [moved from job.c with 100% similarity]
src/job.h [moved from job.h with 100% similarity]
src/linux/auto_dev-ioctl.h [moved from linux/auto_dev-ioctl.h with 100% similarity]
src/list.h [moved from list.h with 100% similarity]
src/load-dropin.c [moved from load-dropin.c with 100% similarity]
src/load-dropin.h [moved from load-dropin.h with 100% similarity]
src/load-fragment.c [moved from load-fragment.c with 100% similarity]
src/load-fragment.h [moved from load-fragment.h with 100% similarity]
src/log.c [moved from log.c with 100% similarity]
src/log.h [moved from log.h with 100% similarity]
src/logger.c [moved from logger.c with 100% similarity]
src/loopback-setup.c [moved from loopback-setup.c with 100% similarity]
src/loopback-setup.h [moved from loopback-setup.h with 100% similarity]
src/macro.h [moved from macro.h with 100% similarity]
src/main.c [moved from main.c with 100% similarity]
src/manager.c [moved from manager.c with 100% similarity]
src/manager.h [moved from manager.h with 100% similarity]
src/missing.h [moved from missing.h with 100% similarity]
src/mount-setup.c [moved from mount-setup.c with 100% similarity]
src/mount-setup.h [moved from mount-setup.h with 100% similarity]
src/mount.c [moved from mount.c with 100% similarity]
src/mount.h [moved from mount.h with 100% similarity]
src/namespace.c [moved from namespace.c with 100% similarity]
src/namespace.h [moved from namespace.h with 100% similarity]
src/ratelimit.c [moved from ratelimit.c with 100% similarity]
src/ratelimit.h [moved from ratelimit.h with 100% similarity]
src/sd-daemon.c [moved from sd-daemon.c with 100% similarity]
src/sd-daemon.h [moved from sd-daemon.h with 100% similarity]
src/securebits.h [moved from securebits.h with 100% similarity]
src/service.c [moved from service.c with 100% similarity]
src/service.h [moved from service.h with 100% similarity]
src/set.c [moved from set.c with 100% similarity]
src/set.h [moved from set.h with 100% similarity]
src/snapshot.c [moved from snapshot.c with 100% similarity]
src/snapshot.h [moved from snapshot.h with 100% similarity]
src/socket-util.c [moved from socket-util.c with 100% similarity]
src/socket-util.h [moved from socket-util.h with 100% similarity]
src/socket.c [moved from socket.c with 100% similarity]
src/socket.h [moved from socket.h with 100% similarity]
src/specifier.c [moved from specifier.c with 100% similarity]
src/specifier.h [moved from specifier.h with 100% similarity]
src/strv.c [moved from strv.c with 100% similarity]
src/strv.h [moved from strv.h with 100% similarity]
src/swap.c [moved from swap.c with 100% similarity]
src/swap.h [moved from swap.h with 100% similarity]
src/systemadm.vala [moved from systemadm.vala with 100% similarity]
src/systemctl.vala [moved from systemctl.vala with 100% similarity]
src/systemd-interfaces.vala [moved from systemd-interfaces.vala with 100% similarity]
src/target.c [moved from target.c with 100% similarity]
src/target.h [moved from target.h with 100% similarity]
src/test-engine.c [moved from test-engine.c with 100% similarity]
src/test-job-type.c [moved from test-job-type.c with 100% similarity]
src/test-loopback.c [moved from test-loopback.c with 100% similarity]
src/test-ns.c [moved from test-ns.c with 100% similarity]
src/timer.c [moved from timer.c with 100% similarity]
src/timer.h [moved from timer.h with 100% similarity]
src/unit-name.c [moved from unit-name.c with 100% similarity]
src/unit-name.h [moved from unit-name.h with 100% similarity]
src/unit.c [moved from unit.c with 100% similarity]
src/unit.h [moved from unit.h with 100% similarity]
src/util.c [moved from util.c with 100% similarity]
src/util.h [moved from util.h with 100% similarity]
src/utmp-wtmp.c [moved from utmp-wtmp.c with 100% similarity]
src/utmp-wtmp.h [moved from utmp-wtmp.h with 100% similarity]

index c676712..0da02af 100644 (file)
@@ -33,11 +33,8 @@ AM_CPPFLAGS = \
        -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
@@ -86,65 +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 = \
-        util.c \
-        hashmap.c \
-        set.c \
-        strv.c \
-        conf-parser.c \
-        socket-util.c \
-        log.c \
-        ratelimit.c
+        src/util.c \
+        src/hashmap.c \
+        src/set.c \
+        src/strv.c \
+        src/conf-parser.c \
+        src/socket-util.c \
+        src/log.c \
+        src/ratelimit.c
 
 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 \
+        src/service.c \
+        src/automount.c \
+        src/mount.c \
+        src/swap.c \
+        src/device.c \
+        src/target.c \
+        src/snapshot.c \
+        src/socket.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 \
+       src/specifier.c \
+       src/unit-name.c \
+       src/fdset.c \
+       src/namespace.c
 
 EXTRA_DIST += \
        ${COMMON_SOURCES:.c=.h} \
-       macro.h \
-       ioprio.h \
-       missing.h \
-       list.h \
-       securebits.h \
-       linux/auto_dev-ioctl.h \
-       initreq.h \
-       sd-daemon.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 \
@@ -163,7 +160,7 @@ EXTRA_DIST += \
 
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
-       main.c
+       src/main.c
 
 systemd_CPPFLAGS = \
        $(AM_CPPFLAGS) \
@@ -178,43 +175,43 @@ systemd_LDADD = \
 
 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.c
+       src/test-engine.c
 
 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-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) \
-       logger.c \
-       sd-daemon.c
+       src/logger.c \
+       src/sd-daemon.c
 
 systemd_initctl_SOURCES = \
        $(BASIC_SOURCES) \
-       initctl.c \
-       sd-daemon.c
+       src/initctl.c \
+       src/sd-daemon.c
 
 systemd_initctl_CPPFLAGS = \
        $(AM_CPPFLAGS) \
@@ -225,7 +222,7 @@ systemd_initctl_LDADD = \
 
 systemd_cgroups_agent_SOURCES = \
        $(BASIC_SOURCES) \
-       cgroups-agent.c
+       src/cgroups-agent.c
 
 systemd_cgroups_agent_CPPFLAGS = \
        $(AM_CPPFLAGS) \
@@ -234,18 +231,31 @@ systemd_cgroups_agent_CPPFLAGS = \
 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.vala \
-       systemd-interfaces.vala
+       src/systemctl.vala \
+       src/systemd-interfaces.vala
 
 systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
 systemctl_LDADD = $(DBUSGLIB_LIBS)
 
 systemadm_SOURCES = \
-       systemadm.vala \
-       systemd-interfaces.vala
+       src/systemadm.vala \
+       src/systemd-interfaces.vala
 
 systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
@@ -261,9 +271,9 @@ systemd-logger.service: units/systemd-logger.service.in Makefile
                < $< > $@
 
 CLEANFILES = \
-       systemd-interfaces.c \
-       systemctl.c \
-       systemadm.c \
+       src/systemd-interfaces.c \
+       src/systemctl.c \
+       src/systemadm.c \
        systemd-initctl.service \
        systemd-logger.service
 
index 1d2efc3..691d970 100644 (file)
 AC_PREREQ(2.63)
 
 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_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])
 
similarity index 100%
rename from automount.c
rename to src/automount.c
similarity index 100%
rename from automount.h
rename to src/automount.h
similarity index 100%
rename from cgroup.c
rename to src/cgroup.c
similarity index 100%
rename from cgroup.h
rename to src/cgroup.h
similarity index 100%
rename from cgroups-agent.c
rename to src/cgroups-agent.c
similarity index 100%
rename from conf-parser.c
rename to src/conf-parser.c
similarity index 100%
rename from conf-parser.h
rename to src/conf-parser.h
similarity index 100%
rename from dbus-automount.c
rename to src/dbus-automount.c
similarity index 100%
rename from dbus-automount.h
rename to src/dbus-automount.h
similarity index 100%
rename from dbus-device.c
rename to src/dbus-device.c
similarity index 100%
rename from dbus-device.h
rename to src/dbus-device.h
similarity index 100%
rename from dbus-execute.c
rename to src/dbus-execute.c
similarity index 100%
rename from dbus-execute.h
rename to src/dbus-execute.h
similarity index 100%
rename from dbus-job.c
rename to src/dbus-job.c
similarity index 100%
rename from dbus-job.h
rename to src/dbus-job.h
similarity index 100%
rename from dbus-manager.c
rename to src/dbus-manager.c
similarity index 100%
rename from dbus-manager.h
rename to src/dbus-manager.h
similarity index 100%
rename from dbus-mount.c
rename to src/dbus-mount.c
similarity index 100%
rename from dbus-mount.h
rename to src/dbus-mount.h
similarity index 100%
rename from dbus-service.c
rename to src/dbus-service.c
similarity index 100%
rename from dbus-service.h
rename to src/dbus-service.h
similarity index 100%
rename from dbus-snapshot.c
rename to src/dbus-snapshot.c
similarity index 100%
rename from dbus-snapshot.h
rename to src/dbus-snapshot.h
similarity index 100%
rename from dbus-socket.c
rename to src/dbus-socket.c
similarity index 100%
rename from dbus-socket.h
rename to src/dbus-socket.h
similarity index 100%
rename from dbus-swap.c
rename to src/dbus-swap.c
similarity index 100%
rename from dbus-swap.h
rename to src/dbus-swap.h
similarity index 100%
rename from dbus-target.c
rename to src/dbus-target.c
similarity index 100%
rename from dbus-target.h
rename to src/dbus-target.h
similarity index 100%
rename from dbus-unit.c
rename to src/dbus-unit.c
similarity index 100%
rename from dbus-unit.h
rename to src/dbus-unit.h
similarity index 100%
rename from dbus.c
rename to src/dbus.c
similarity index 100%
rename from dbus.h
rename to src/dbus.h
similarity index 100%
rename from device.c
rename to src/device.c
similarity index 100%
rename from device.h
rename to src/device.h
similarity index 100%
rename from execute.c
rename to src/execute.c
similarity index 100%
rename from execute.h
rename to src/execute.h
similarity index 100%
rename from fdset.c
rename to src/fdset.c
similarity index 100%
rename from fdset.h
rename to src/fdset.h
similarity index 100%
rename from hashmap.c
rename to src/hashmap.c
similarity index 100%
rename from hashmap.h
rename to src/hashmap.h
similarity index 100%
rename from hostname-setup.c
rename to src/hostname-setup.c
similarity index 100%
rename from hostname-setup.h
rename to src/hostname-setup.h
similarity index 100%
rename from initctl.c
rename to src/initctl.c
similarity index 100%
rename from initreq.h
rename to src/initreq.h
similarity index 100%
rename from ioprio.h
rename to src/ioprio.h
diff --git a/job.c b/src/job.c
similarity index 100%
rename from job.c
rename to src/job.c
diff --git a/job.h b/src/job.h
similarity index 100%
rename from job.h
rename to src/job.h
similarity index 100%
rename from list.h
rename to src/list.h
similarity index 100%
rename from load-dropin.c
rename to src/load-dropin.c
similarity index 100%
rename from load-dropin.h
rename to src/load-dropin.h
similarity index 100%
rename from load-fragment.c
rename to src/load-fragment.c
similarity index 100%
rename from load-fragment.h
rename to src/load-fragment.h
diff --git a/log.c b/src/log.c
similarity index 100%
rename from log.c
rename to src/log.c
diff --git a/log.h b/src/log.h
similarity index 100%
rename from log.h
rename to src/log.h
similarity index 100%
rename from logger.c
rename to src/logger.c
similarity index 100%
rename from loopback-setup.c
rename to src/loopback-setup.c
similarity index 100%
rename from loopback-setup.h
rename to src/loopback-setup.h
similarity index 100%
rename from macro.h
rename to src/macro.h
similarity index 100%
rename from main.c
rename to src/main.c
similarity index 100%
rename from manager.c
rename to src/manager.c
similarity index 100%
rename from manager.h
rename to src/manager.h
similarity index 100%
rename from missing.h
rename to src/missing.h
similarity index 100%
rename from mount-setup.c
rename to src/mount-setup.c
similarity index 100%
rename from mount-setup.h
rename to src/mount-setup.h
similarity index 100%
rename from mount.c
rename to src/mount.c
similarity index 100%
rename from mount.h
rename to src/mount.h
similarity index 100%
rename from namespace.c
rename to src/namespace.c
similarity index 100%
rename from namespace.h
rename to src/namespace.h
similarity index 100%
rename from ratelimit.c
rename to src/ratelimit.c
similarity index 100%
rename from ratelimit.h
rename to src/ratelimit.h
similarity index 100%
rename from sd-daemon.c
rename to src/sd-daemon.c
similarity index 100%
rename from sd-daemon.h
rename to src/sd-daemon.h
similarity index 100%
rename from securebits.h
rename to src/securebits.h
similarity index 100%
rename from service.c
rename to src/service.c
similarity index 100%
rename from service.h
rename to src/service.h
diff --git a/set.c b/src/set.c
similarity index 100%
rename from set.c
rename to src/set.c
diff --git a/set.h b/src/set.h
similarity index 100%
rename from set.h
rename to src/set.h
similarity index 100%
rename from snapshot.c
rename to src/snapshot.c
similarity index 100%
rename from snapshot.h
rename to src/snapshot.h
similarity index 100%
rename from socket-util.c
rename to src/socket-util.c
similarity index 100%
rename from socket-util.h
rename to src/socket-util.h
similarity index 100%
rename from socket.c
rename to src/socket.c
similarity index 100%
rename from socket.h
rename to src/socket.h
similarity index 100%
rename from specifier.c
rename to src/specifier.c
similarity index 100%
rename from specifier.h
rename to src/specifier.h
similarity index 100%
rename from strv.c
rename to src/strv.c
similarity index 100%
rename from strv.h
rename to src/strv.h
similarity index 100%
rename from swap.c
rename to src/swap.c
similarity index 100%
rename from swap.h
rename to src/swap.h
similarity index 100%
rename from systemadm.vala
rename to src/systemadm.vala
similarity index 100%
rename from systemctl.vala
rename to src/systemctl.vala
similarity index 100%
rename from target.c
rename to src/target.c
similarity index 100%
rename from target.h
rename to src/target.h
similarity index 100%
rename from test-engine.c
rename to src/test-engine.c
similarity index 100%
rename from test-job-type.c
rename to src/test-job-type.c
similarity index 100%
rename from test-loopback.c
rename to src/test-loopback.c
similarity index 100%
rename from test-ns.c
rename to src/test-ns.c
similarity index 100%
rename from timer.c
rename to src/timer.c
similarity index 100%
rename from timer.h
rename to src/timer.h
similarity index 100%
rename from unit-name.c
rename to src/unit-name.c
similarity index 100%
rename from unit-name.h
rename to src/unit-name.h
similarity index 100%
rename from unit.c
rename to src/unit.c
similarity index 100%
rename from unit.h
rename to src/unit.h
similarity index 100%
rename from util.c
rename to src/util.c
similarity index 100%
rename from util.h
rename to src/util.h
similarity index 100%
rename from utmp-wtmp.c
rename to src/utmp-wtmp.c
similarity index 100%
rename from utmp-wtmp.h
rename to src/utmp-wtmp.h