Makefile changed to make it work with 'make -jN' where N>1
This commit is contained in:
parent
0ac39033c7
commit
71a9574a51
1 changed files with 12 additions and 4 deletions
|
@ -11,17 +11,25 @@ daemon: $(exedir)/bird
|
||||||
|
|
||||||
client: $(exedir)/birdc
|
client: $(exedir)/birdc
|
||||||
|
|
||||||
subdir depend: .dir-stamp
|
bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
|
||||||
|
|
||||||
|
$(bird-dep): sysdep/paths.h .dep-stamp subdir
|
||||||
|
|
||||||
|
birdc-dep := client/all.o lib/birdlib.a
|
||||||
|
|
||||||
|
$(birdc-dep): sysdep/paths.h .dep-stamp subdir
|
||||||
|
|
||||||
|
subdir depend: sysdep/paths.h .dir-stamp
|
||||||
set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
|
set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
|
||||||
set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
|
set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
|
||||||
|
|
||||||
$(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
|
$(exedir)/bird: $(bird-dep)
|
||||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
$(exedir)/birdc: client/all.o lib/birdlib.a
|
$(exedir)/birdc: $(birdc-dep)
|
||||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
|
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
|
||||||
|
|
||||||
.dir-stamp:
|
.dir-stamp: sysdep/paths.h
|
||||||
mkdir -p $(static-dirs) $(client-dirs) $(doc-dirs)
|
mkdir -p $(static-dirs) $(client-dirs) $(doc-dirs)
|
||||||
touch .dir-stamp
|
touch .dir-stamp
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue