diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-23 11:50:34 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-23 11:50:34 +0100 |
| commit | 736e143fa50607fcd88132291e96089b899af979 (patch) | |
| tree | c0fcd5fb3174bae8a39b3a32dfe582b2ccb6df17 /tools/Rules.in | |
| parent | 094d2bdb79e1ffa0a02761fd651aa0f0b6b0c585 (diff) | |
| parent | 2b3d52aa421ae1c31e30107beefd82fddbb42854 (diff) | |
Merge branch 'master' into add-path
Conflicts:
filter/filter.c
nest/proto.c
nest/rt-table.c
proto/bgp/bgp.h
proto/bgp/config.Y
Diffstat (limited to 'tools/Rules.in')
| -rw-r--r-- | tools/Rules.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/Rules.in b/tools/Rules.in index fc06aeb1..ca930ec8 100644 --- a/tools/Rules.in +++ b/tools/Rules.in @@ -11,7 +11,7 @@ static-dirs := nest filter $(addprefix proto/,$(protocols)) static-dir-paths := $(addprefix $(srcdir)/,$(static-dirs)) dynamic-dirs := lib conf dynamic-dir-paths := $(dynamic-dirs) -client-dirs := @CLIENT@ +client-dirs := client client-dir-paths := $(client-dirs) doc-dirs := doc doc-dir-paths := $(doc-dirs) @@ -75,8 +75,12 @@ endif %.o: $(src-path)%.c $(CC) $(CFLAGS) -o $@ -c $< +ifndef source-dep +source-dep := $(source) +endif + depend: - $(CC) $(CPPFLAGS) -MM $(addprefix $(src-path),$(source)) >depend + $(CC) $(CPPFLAGS) -MM $(addprefix $(src-path),$(source-dep)) >depend ifneq ($(wildcard depend),) include depend |