build-sys: generate intermediate files in subdirs

diff --git a/.gitignore b/.gitignore
index b83dd9acd79d00df35f751d28b446f8f386513b1..4efd8247961d396d5a076898a3ae70a7dcc5fd9a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,19 @@
-*.5
-*.html
-*~
-*.tar.gz
 test-ns
 test-loopback
-systemd-initctl.service
-systemd-logger.service
 systemd-cgroups-agent
 systemd-initctl
 systemd
-*.o
 test-engine
 test-job-type
 systemd-logger
 systemctl
-systemctl.c
-systemd-interfaces.c
 systemadm
-systemadm.c
+.dirstamp
+*.5
+*.html
+*~
+*.tar.gz
+*.o
 .deps/
 Makefile.in
 aclocal.m4

diff --git a/Makefile.am b/Makefile.am
index 0da02af0056edf5812ff6cce2065eb8b4799591e..35ecebaadda9526579451f5e5b995664ace65fb9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,10 +59,10 @@ noinst_PROGRAMS = \
        test-loopback
 
 dist_dbuspolicy_DATA = \
-       org.freedesktop.systemd1.conf
+       src/org.freedesktop.systemd1.conf
 
 dist_udevrules_DATA = \
-       99-systemd.rules
+       src/99-systemd.rules
 
 dist_systemunit_DATA = \
        units/emergency.service \
@@ -70,8 +70,8 @@ dist_systemunit_DATA = \
        units/systemd-logger.socket
 
 systemunit_DATA = \
-       systemd-initctl.service \
-       systemd-logger.service
+       units/systemd-initctl.service \
+       units/systemd-logger.service
 
 EXTRA_DIST = \
        units/systemd-initctl.service.in \
@@ -144,12 +144,12 @@ EXTRA_DIST += \
        src/sd-daemon.h
 
 dist_man_MANS = \
-       systemd.unit.5 \
-       systemd.service.5
+       man/systemd.unit.5 \
+       man/systemd.service.5
 
 HTMLMANS = \
-       systemd.unit.html \
-       systemd.service.html
+       man/systemd.unit.html \
+       man/systemd.service.html
 
 dist_noinst_DATA = \
        $(HTMLMANS)
@@ -260,12 +260,14 @@ systemadm_SOURCES = \
 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
+units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
+       $(MKDIR_P) units
        $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
                -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                < $< > $@
 
-systemd-logger.service: units/systemd-logger.service.in Makefile
+units/systemd-logger.service: units/systemd-logger.service.in Makefile
+       $(MKDIR_P) units
        $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
                -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                < $< > $@
@@ -274,14 +276,16 @@ CLEANFILES = \
        src/systemd-interfaces.c \
        src/systemctl.c \
        src/systemadm.c \
-       systemd-initctl.service \
-       systemd-logger.service
+       units/systemd-initctl.service \
+       units/systemd-logger.service
 
 if HAVE_XSLTPROC
-%.5: man/%.xml
+man/%.5: man/%.xml
+       $(MKDIR_P) man
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-%.html: man/%.xml
+man/%.html: man/%.xml
+       $(MKDIR_P) man
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 CLEANFILES += \

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644 (file)
index 0000000..954d7fe
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,3 @@
+systemctl.c
+systemd-interfaces.c
+systemadm.c

diff --git a/units/.gitignore b/units/.gitignore
new file mode 100644 (file)
index 0000000..88895b6
--- /dev/null
+++ b/units/.gitignore
@@ -0,0 +1,2 @@
+systemd-initctl.service
+systemd-logger.service