diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 13 | ||||
| -rw-r--r-- | tools/Rules.in | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 1f41e829..337c1b43 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -7,17 +7,20 @@ srcdir_abs := $(shell cd $(srcdir) ; pwd) .PHONY: all subdir depend clean distclean tags -all: .dep-stamp subdir $(exedir)/bird +all: .dep-stamp subdir $(exedir)/bird $(exedir)/birdc subdir depend: .dir-stamp set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done - set -e ; for a in $(static-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 $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +$(exedir)/birdc: client/all.o lib/birdlib.a + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + .dir-stamp: - mkdir -p $(static-dirs) + mkdir -p $(static-dirs) $(client-dirs) touch .dir-stamp .dep-stamp: @@ -25,11 +28,11 @@ $(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a touch .dep-stamp tags: - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) -name *.[chY]` + cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` clean: find . -name "*.[oa]" -or -name core -or -name depend | xargs rm -f - rm -f $(exedir)/bird .dep-stamp + rm -f $(exedir)/bird $(exedir)/birdc .dep-stamp distclean: clean rm -f config.* configure sysdep/autoconf.h Makefile Rules diff --git a/tools/Rules.in b/tools/Rules.in index 23f171ac..fc3d2b1a 100644 --- a/tools/Rules.in +++ b/tools/Rules.in @@ -10,11 +10,11 @@ static-dirs := nest filter $(addprefix proto/,$(protocols)) static-dir-paths := $(addprefix $(srcdir)/,$(static-dirs)) dynamic-dirs := lib conf dynamic-dir-paths := $(dynamic-dirs) -dir-makefiles := $(addsuffix /Makefile,$(static-dir-paths) $(dynamic-dir-paths)) +client-dirs := client +client-dir-paths := $(client-dirs) -all-dirs:=$(static-dirs) $(dynamic-dirs) +all-dirs:=$(static-dirs) $(dynamic-dirs) $(client-dirs) clean-dirs:=$(all-dirs) proto sysdep -dir-objs:=$(addprefix $(objdir)/,$(all-dirs)) CPPFLAGS=-I$(root-rel) -I$(srcdir) @CPPFLAGS@ CFLAGS=$(CPPFLAGS) @CFLAGS@ |