From 39fa4cc0b6db2c03046a7552796cf368e8cdb695 Mon Sep 17 00:00:00 2001
From: Sven Robertz <sven@cs.lth.se>
Date: Wed, 14 Dec 2011 16:35:55 +0100
Subject: [PATCH] moved experimental reader/writers into separate dir
---
lib/c/Makefile | 8 +++++---
lib/c/README | 2 +-
lib/c/{ => experimental}/labcomm_thr_reader_writer.c | 0
lib/c/{ => experimental}/labcomm_thr_reader_writer.h | 0
lib/c/{ => experimental}/labcomm_udp_reader_writer.c | 0
lib/c/{ => experimental}/labcomm_udp_reader_writer.h | 0
lib/c/{ => experimental}/udp_hack.c | 0
lib/c/{ => experimental}/udp_hack.h | 0
8 files changed, 6 insertions(+), 4 deletions(-)
rename lib/c/{ => experimental}/labcomm_thr_reader_writer.c (100%)
rename lib/c/{ => experimental}/labcomm_thr_reader_writer.h (100%)
rename lib/c/{ => experimental}/labcomm_udp_reader_writer.c (100%)
rename lib/c/{ => experimental}/labcomm_udp_reader_writer.h (100%)
rename lib/c/{ => experimental}/udp_hack.c (100%)
rename lib/c/{ => experimental}/udp_hack.h (100%)
diff --git a/lib/c/Makefile b/lib/c/Makefile
index 90b7bc6..11ed738 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -1,7 +1,9 @@
CC = gcc
-CFLAGS = -g
+CFLAGS = -g -I .
-liblabcomm.a : labcomm.o labcomm_fd_reader_writer.o labcomm_udp_reader_writer.o udp_hack.o labcomm_thr_reader_writer.o ethaddr.o ThrottleDrv/ethernet_drv.o ThrottleDrv/throttle_drv.o
+liblabcomm.a : labcomm.o labcomm_fd_reader_writer.o experimental/labcomm_udp_reader_writer.o \
+ experimental/udp_hack.o labcomm_thr_reader_writer.o ethaddr.o \
+ ThrottleDrv/ethernet_drv.o ThrottleDrv/throttle_drv.o
# ar -r liblabcomm.a labcomm.o labcomm_fd_reader_writer.o ethaddr.o
ar -r liblabcomm.a $^
@@ -14,7 +16,7 @@ ethaddr.o: ethaddr.c
%o: %c %h
clean:
- rm *.o
+ rm *.o experimental/*.o ThrottleDrv/*.o
distclean: clean
rm liblabcomm.a
diff --git a/lib/c/README b/lib/c/README
index 11ca01f..4196000 100644
--- a/lib/c/README
+++ b/lib/c/README
@@ -2,6 +2,6 @@ Throttlenet library
The library consists of a generic part and readers/writers for the low-level transport.
-The stable low-level is the _fd_ variety, on top of unix sockets.
+The stable low-level is the _fd_ variety, on top of unix file descriptors.
Currently, experimental varieties include datagrams on top of UDP and raw ethernet
diff --git a/lib/c/labcomm_thr_reader_writer.c b/lib/c/experimental/labcomm_thr_reader_writer.c
similarity index 100%
rename from lib/c/labcomm_thr_reader_writer.c
rename to lib/c/experimental/labcomm_thr_reader_writer.c
diff --git a/lib/c/labcomm_thr_reader_writer.h b/lib/c/experimental/labcomm_thr_reader_writer.h
similarity index 100%
rename from lib/c/labcomm_thr_reader_writer.h
rename to lib/c/experimental/labcomm_thr_reader_writer.h
diff --git a/lib/c/labcomm_udp_reader_writer.c b/lib/c/experimental/labcomm_udp_reader_writer.c
similarity index 100%
rename from lib/c/labcomm_udp_reader_writer.c
rename to lib/c/experimental/labcomm_udp_reader_writer.c
diff --git a/lib/c/labcomm_udp_reader_writer.h b/lib/c/experimental/labcomm_udp_reader_writer.h
similarity index 100%
rename from lib/c/labcomm_udp_reader_writer.h
rename to lib/c/experimental/labcomm_udp_reader_writer.h
diff --git a/lib/c/udp_hack.c b/lib/c/experimental/udp_hack.c
similarity index 100%
rename from lib/c/udp_hack.c
rename to lib/c/experimental/udp_hack.c
diff --git a/lib/c/udp_hack.h b/lib/c/experimental/udp_hack.h
similarity index 100%
rename from lib/c/udp_hack.h
rename to lib/c/experimental/udp_hack.h
--
GitLab