[systemd-commits] 2 commits - Makefile.am units/.gitignore

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am      |   17 +++++++----------
 units/.gitignore |    3 +++
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 38936e3cfaa9c813fe778448de49996429687ad5
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jan 29 21:18:19 2013 -0500

    build-sys: inline two definitions which were only used in one place

diff --git a/Makefile.am b/Makefile.am
index 1f36aee..33d96e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3877,19 +3877,13 @@ src/%: src/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
-M4_PROCESS_SYSTEM = \
-	$(AM_V_M4)$(MKDIR_P) $(dir $@) && \
-	$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-
-M4_PROCESS_USER = \
-	$(AM_V_M4)$(MKDIR_P) $(dir $@) && \
-	$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
-
 units/%: units/%.m4 Makefile
-	$(M4_PROCESS_SYSTEM)
+	$(AM_V_M4)$(MKDIR_P) $(dir $@)
+	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4 Makefile
-	$(M4_PROCESS_USER)
+	$(AM_V_M4)$(MKDIR_P) $(dir $@)
+	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \

commit 652e737517bbbae692923246aeb687e2d1f314ef
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jan 29 21:17:40 2013 -0500

    build-sys: keep intermediate files
    
    Sometimes it is useful to look at them, and they don't take
    up any significant amount of space. Keeping them also avoids
    the message about files being removed at the end of make
    run.

diff --git a/Makefile.am b/Makefile.am
index f014931..1f36aee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,9 @@ SUBDIRS = . po
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
+# keep intermediate files
+.SECONDARY:
+
 LIBUDEV_CURRENT=3
 LIBUDEV_REVISION=1
 LIBUDEV_AGE=2
diff --git a/units/.gitignore b/units/.gitignore
index 5e86d30..b1e81ab 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -6,6 +6,7 @@
 /systemd-hibernate.service
 /systemd-suspend.service
 /console-getty.service
+/console-getty.service.m4
 /systemd-journald.service
 /user at .service
 /systemd-logind.service
@@ -13,9 +14,11 @@
 /systemd-timedated.service
 /systemd-hostnamed.service
 /console-shell.service
+/console-shell.service.m4
 /systemd-sysctl.service
 /systemd-ask-password-console.service
 /rescue.service
+/rescue.service.m4
 /systemd-ask-password-wall.service
 /systemd-quotacheck.service
 /quotaon.service