fix makefile

diff --git a/support/sdk/c/blip/driver/Makefile b/support/sdk/c/blip/driver/Makefile
index b72b6bbf4604c0b9287cfb11dd6b79fb600840ab..db699908c527b366924fc12b452325921f3f3b9c 100644 (file)
--- a/support/sdk/c/blip/driver/Makefile
+++ b/support/sdk/c/blip/driver/Makefile
@@ -2,12 +2,12 @@
 SOURCES=serial_tun.c tun_dev.c hashtable.c routing.c nwstate.c \
        logging.c config.c radvd-wrapper.c vty/util.c vty/vty.c \
        netlink.c mcast.c
-
-COMMON_SRC = radvd/log.c radvd/socket.c radvd/recv.c radvd/util.c radvd/radvd.h \
-       radvd/defaults.h radvd/pathnames.h \
-        radvd/includes.h
-radvd_SOURCES = $(COMMON_SRC) radvd/timer.c radvd/send.c radvd/process.c radvd/interface.c \
-        radvd/device.c radvd/device-common.c radvd/gram.h 
+RADVD_dir = radvd-1.0
+COMMON_SRC = $(RADVD_dir)/log.c $(RADVD_dir)/socket.c $(RADVD_dir)/recv.c $(RADVD_dir)/util.c $(RADVD_dir)/radvd.h \
+       $(RADVD_dir)/defaults.h $(RADVD_dir)/pathnames.h \
+       $(RADVD_dir)/includes.h
+RADVD_SOURCES = $(COMMON_SRC) $(RADVD_dir)/timer.c $(RADVD_dir)/send.c $(RADVD_dir)/process.c $(RADVD_dir)/interface.c \
+        $(RADVD_dir)/device.c $(RADVD_dir)/device-common.c $(RADVD_dir)/gram.h 
 
 LIBS=../lib6lowpan.a ${TOSROOT}/support/sdk/c/sf/libmote.a
 TARGET=ip-driver
@@ -18,7 +18,7 @@ GCC=gcc
 endif
 
 TFLAGS=-Wall -DPC -D_GNU_SOURCE  -g
-TFLAGS+=-I${TOSROOT}/support/sdk/c/sf -I$(INCLUDE) -Iradvd/ -Ivty/
+TFLAGS+=-I${TOSROOT}/support/sdk/c/sf -I$(INCLUDE) -I$(RADVD_dir)/ -Ivty/
 
 # CFLAGS+= -DCENTRALIZED_ROUTING
 # CFLAGS+=-DFULL_PATH_INSTALL
@@ -47,7 +47,7 @@ sim-null:
        echo Built $(TARGET) for TOSSIM
 
 $(TARGET): $(SOURCES) $(LIBS)
-       $(GCC) $(TFLAGS) $(CFLAGS) -o $(TARGET) $(SOURCES) $(radvd_SOURCES) $(LIBS) -lm
+       $(GCC) $(TFLAGS) $(CFLAGS) -o $(TARGET) $(SOURCES) $(RADVD_SOURCES) $(LIBS) -lm
 
 clean:
        rm -f $(TARGET)

diff --git a/support/sdk/c/blip/driver/config.c b/support/sdk/c/blip/driver/config.c
index 48e53a12709a3ac3017be576b48b9a1eafeb4b77..3c8260806fd8023e2209f2faff9dc182a0936a69 100644 (file)
--- a/support/sdk/c/blip/driver/config.c
+++ b/support/sdk/c/blip/driver/config.c
@@ -113,7 +113,7 @@ void config_print(int fd, int argc, char **argv) { //struct config *c) {
   VTY_printf ("  router address: %s\r\n", buf);
   VTY_printf("  proxy dev: %s\r\n", lastconfig->proxy_dev);
   VTY_printf("  channel: %i\r\n", lastconfig->channel);
-  VTY_printf("  version: %s\r\n", STR($Id$));
+  VTY_printf("  version: %s\r\n", " $Id: config.c,v 1.2 2009/08/09 23:36:05 sdhsdh Exp ");
   VTY_printf("  retries: %i\r\n", lastconfig->retries);
   VTY_flush();
 }