From d2c392d44839baaefa48f4a38060be648d3415fb Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 19 Apr 2013 13:59:08 +0200
Subject: Removes unnecessary client subdirectories and updates buildsystem.

Renames some files:
birdc/client.c -> birdc.c
birdcl/client.c -> birdcl.c
client_common.c -> common.c
---
 tools/Rules.in | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tools/Rules.in')

diff --git a/tools/Rules.in b/tools/Rules.in
index fd10f5de..ca930ec8 100644
--- a/tools/Rules.in
+++ b/tools/Rules.in
@@ -11,14 +11,12 @@ static-dirs := nest filter $(addprefix proto/,$(protocols))
 static-dir-paths := $(addprefix $(srcdir)/,$(static-dirs))
 dynamic-dirs := lib conf
 dynamic-dir-paths := $(dynamic-dirs)
-birdc-dirs := client client/@CLIENT@
-birdc-dir-paths := $(birdc-dirs)
-birdcl-dirs := client client/birdcl
-birdcl-dir-paths := $(birdcl-dirs)
+client-dirs := client
+client-dir-paths := $(client-dirs)
 doc-dirs := doc
 doc-dir-paths := $(doc-dirs)
 
-all-dirs:=$(static-dirs) $(dynamic-dirs) $(birdc-dirs) $(doc-dirs)
+all-dirs:=$(static-dirs) $(dynamic-dirs) $(client-dirs) $(doc-dirs)
 clean-dirs:=$(all-dirs) proto sysdep
 
 CPPFLAGS=-I$(root-rel) -I$(srcdir) @CPPFLAGS@
@@ -77,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
-- 
cgit v1.2.3