Attachment 900078 Details for Bug 1100899 – fix Makefile for parallelized make-jobs

[patch] fix Makefile for parallelized make-jobs

ratools-0.5.1_fix-Makefile.patch (text/plain), 2.72 KB, created by Björn 'besser82' Esser on 2014-05-28 16:39:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn 'besser82' Esser

Created: 2014-05-28 16:39:14 UTC

Size: 2.72 KB

patch

obsolete

>diff --git a/src/Makefile b/src/Makefile
>index dc786c3..df09dc9 100644
>--- a/src/Makefile
>+++ b/src/Makefile
>@@ -14,67 +14,73 @@ BASHDIR      = ../bash-completion.d
> .PHONY:     all clean
> .DEFAULT:   all
> 
>-all: 		rad ractl racomplete-ractl bash-completion
>+
>+all:                         \
>+	rad                  \
>+	ractl                \
>+	bash-completion
>+
> 
> %.o:	%.c %.h ratools.h
> 	$(CC) $(CFLAGS) $(CDEFS) -c $<
> 
>-ractl: \
>-	library.o       \
>-	log.o           \
>-	module.o        \
>-	ra.o            \
>-	opt_mtu.o       \
>-	opt_sll.o       \
>-	opt_pi.o        \
>-	opt_rdnss.o     \
>-	opt_exp.o       \
>+
>+ractl:                       \
>+	library.o            \
>+	log.o                \
>+	module.o             \
>+	ra.o                 \
>+	opt_mtu.o            \
>+	opt_sll.o            \
>+	opt_pi.o             \
>+	opt_rdnss.o          \
>+	opt_exp.o            \
> 	ractl.o
>-	[ -d "$(BINDIR)" ] || mkdir "$(BINDIR)"
>+	mkdir -p "$(BASHDIR)" "$(BINDIR)"
> 	$(CC) $(CFLAGS) $(CDEFS) $(LDFLAGS) -o $(BINDIR)/$@ $^
> 
>-rad: \
>-	library.o       \
>-	log.o           \
>-	database.o      \
>-	module.o        \
>-	multicast.o     \
>-	netlink.o       \
>-	proc.o          \
>-	packetset.o     \
>-	ra.o            \
>-	opt_mtu.o       \
>-	opt_sll.o       \
>-	opt_pi.o        \
>-	opt_rdnss.o     \
>-	opt_exp.o       \
>+
>+rad:                         \
>+	library.o            \
>+	log.o                \
>+	database.o           \
>+	module.o             \
>+	multicast.o          \
>+	netlink.o            \
>+	proc.o               \
>+	packetset.o          \
>+	ra.o                 \
>+	opt_mtu.o            \
>+	opt_sll.o            \
>+	opt_pi.o             \
>+	opt_rdnss.o          \
>+	opt_exp.o            \
> 	rad.o
>-	[ -d "$(BINDIR)" ] || mkdir "$(BINDIR)"
>+	mkdir -p "$(BASHDIR)" "$(BINDIR)"
> 	$(CC) $(CFLAGS) $(CDEFS) $(LDFLAGS) -o $(BINDIR)/$@ $^
> 
>-racomplete-ractl: \
>-	library.o       \
>-	log.o           \
>-	module.o        \
>-	ra.o            \
>-	opt_mtu.o       \
>-	opt_sll.o       \
>-	opt_pi.o        \
>-	opt_rdnss.o     \
>-	opt_exp.o       \
>+
>+racomplete-ractl:            \
>+	library.o            \
>+	log.o                \
>+	module.o             \
>+	ra.o                 \
>+	opt_mtu.o            \
>+	opt_sll.o            \
>+	opt_pi.o             \
>+	opt_rdnss.o          \
>+	opt_exp.o            \
> 	racomplete-ractl.o
>-	[ -d "$(BINDIR)" ] || mkdir "$(BINDIR)"
>+	mkdir -p "$(BASHDIR)" "$(BINDIR)"
> 	$(CC) $(CFLAGS) $(CDEFS) $(LDFLAGS) -o $(BINDIR)/$@ $^
> 
>-bash-completion: \
>-	$(BINDIR)/racomplete-ractl
>-	[ -d "$(BASHDIR)" ] || mkdir "$(BASHDIR)"
>+
>+bash-completion:             \
>+	racomplete-ractl
> 	$(BINDIR)/racomplete-ractl > $(BASHDIR)/ractl.sh
> 
> 
> clean:
>-	rm -f     *.o
>-	rm -rf    "$(BINDIR)"
>-	rm -rf    "$(BASHDIR)"
>-
>-
>+	rm -rf	*.o          \
>+		"$(BASHDIR)" \
>+		"$(BINDIR)"

Actions: View | Diff

Attachments on bug 1100899: 899924 | 900078