summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-02 02:39:00 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-02 02:39:00 -0400
commitd2556f9977122552e1b6ba4a233a500ce86b1343 (patch)
treebbf022e36d34013eb4a9c58a247db9d7445f7497 /build-aux
parenta422a6a26da229bd168815958d55a582188f40bb (diff)
get libsystemd-journal-internal building
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/Makefile.each.tail/20-systemd.mk4
-rw-r--r--build-aux/Makefile.once.head/20-systemd.mk2
2 files changed, 6 insertions, 0 deletions
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
index a774fa5424..3b533309a8 100644
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ b/build-aux/Makefile.each.tail/20-systemd.mk
@@ -24,6 +24,10 @@
-include $(outdir)/$(DEPDIR)/*.P*
std.clean_files += *.o *.lo .deps/ .libs/
+std.clean_files += *-list.txt
+std.clean_files += *-from-name.gperf
+std.clean_files += *-from-name.h
+std.clean_files += *-to-name.h
$(outdir)/%.o: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps
$(AM_V_CC)$(COMPILE) -c -o $@ $<
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index eefed97d1e..6f528c5b2b 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -21,6 +21,8 @@
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+SHELL = bash -o pipefail
+
OUR_CPPFLAGS += -MT $@ -MD -MP -MF $(@D)/$(DEPDIR)/$(basename $(@F)).P$(patsubst .%,%,$(suffix $(@F)))
OUR_CPPFLAGS += -include $(topoutdir)/config.h
OUR_CPPFLAGS += $(if $(<D),-I$(<D)) -I$(@D)