diff options
| author | Ondrej Filip <feela@majklik.network.cz> | 2009-08-09 19:43:42 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@majklik.network.cz> | 2009-08-09 19:43:42 +0200 |
| commit | 71a9574a515613cded23b20f260a88784bcd4286 (patch) | |
| tree | 4591586d50dfe3276e5957d2f8f5d6f5e78dd0c6 | |
| parent | 0ac39033c7470f7301bb108f8e777c7ce6af273f (diff) | |
| download | bird-71a9574a515613cded23b20f260a88784bcd4286.tar bird-71a9574a515613cded23b20f260a88784bcd4286.zip | |
Makefile changed to make it work with 'make -jN' where N>1
| -rw-r--r-- | tools/Makefile.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 6307cf0..eeef8f5 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -11,17 +11,25 @@ daemon: $(exedir)/bird 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 $(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) -$(exedir)/birdc: client/all.o lib/birdlib.a +$(exedir)/birdc: $(birdc-dep) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS) -.dir-stamp: +.dir-stamp: sysdep/paths.h mkdir -p $(static-dirs) $(client-dirs) $(doc-dirs) touch .dir-stamp |