summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/common/Makefile8
-rw-r--r--examples/common/listener_mrp_client.c (renamed from examples/simple_listener/listener_mrp_client.c)0
-rw-r--r--examples/common/listener_mrp_client.h (renamed from examples/simple_listener/listener_mrp_client.h)0
-rw-r--r--examples/common/talker_mrp_client.c (renamed from examples/simple_talker/talker_mrp_client.c)0
-rw-r--r--examples/common/talker_mrp_client.h (renamed from examples/simple_talker/talker_mrp_client.h)0
-rw-r--r--examples/simple_listener/Makefile10
-rw-r--r--examples/simple_talker/Makefile11
7 files changed, 19 insertions, 10 deletions
diff --git a/examples/common/Makefile b/examples/common/Makefile
index c8d8d060..aeed36ce 100644
--- a/examples/common/Makefile
+++ b/examples/common/Makefile
@@ -6,11 +6,17 @@ INCFLAGS=-I../../lib/igb
LDLIBS=-ligb -lpci -lz -lrt -lm -pthread
LDFLAGS=-L../../lib/igb
-all: avb
+all: avb talker_mrp_client.o listener_mrp_client.o
avb:
gcc $(INCFLAGS) -c avb.c
+talker_mrp_client.o: talker_mrp_client.c talker_mrp_client.h
+ gcc $(CFLAGS) -I../../daemons/mrpd -c talker_mrp_client.c
+
+listener_mrp_client.o: listener_mrp_client.c listener_mrp_client.h
+ gcc $(CFLAGS) -I../../daemons/mrpd -c listener_mrp_client.c
+
clean:
rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"` avb.o
diff --git a/examples/simple_listener/listener_mrp_client.c b/examples/common/listener_mrp_client.c
index 869d2aa5..869d2aa5 100644
--- a/examples/simple_listener/listener_mrp_client.c
+++ b/examples/common/listener_mrp_client.c
diff --git a/examples/simple_listener/listener_mrp_client.h b/examples/common/listener_mrp_client.h
index 142d8f39..142d8f39 100644
--- a/examples/simple_listener/listener_mrp_client.h
+++ b/examples/common/listener_mrp_client.h
diff --git a/examples/simple_talker/talker_mrp_client.c b/examples/common/talker_mrp_client.c
index 981006fa..981006fa 100644
--- a/examples/simple_talker/talker_mrp_client.c
+++ b/examples/common/talker_mrp_client.c
diff --git a/examples/simple_talker/talker_mrp_client.h b/examples/common/talker_mrp_client.h
index 2dee00f3..2dee00f3 100644
--- a/examples/simple_talker/talker_mrp_client.h
+++ b/examples/common/talker_mrp_client.h
diff --git a/examples/simple_listener/Makefile b/examples/simple_listener/Makefile
index fed20964..35e4b0d1 100644
--- a/examples/simple_listener/Makefile
+++ b/examples/simple_listener/Makefile
@@ -2,20 +2,22 @@ OPT=-O2
CFLAGS=$(OPT) -Wall -W -Wno-parentheses
CC = gcc
+INCFLAGS=-I../../daemons/mrpd -I../common
LDLIBS = -lpcap -lsndfile
all: simple_listener
-simple_listener: simple_listener.o listener_mrp_client.o
+simple_listener: simple_listener.o ../common/listener_mrp_client.o
simple_listener.o: simple_listener.c
- gcc -c $(INCFLAGS) -I../../daemons/mrpd $(CFLAGS) simple_listener.c
+ gcc -c $(INCFLAGS) $(CFLAGS) simple_listener.c
-listener_mrp_client.o: listener_mrp_client.c
- gcc -c $(INCFLAGS) -I../../daemons/mrpd $(CFLAGS) listener_mrp_client.c
+../common/listener_mrp_client.o:
+ make -C ../common/ listener_mrp_client.o
%: %.o
$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
clean:
rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"` simple_listener
+ rm -f ../common/listener_mrp_client.o
diff --git a/examples/simple_talker/Makefile b/examples/simple_talker/Makefile
index 6e34b94b..2fddf2c6 100644
--- a/examples/simple_talker/Makefile
+++ b/examples/simple_talker/Makefile
@@ -2,23 +2,24 @@ OPT=-O2
CFLAGS=$(OPT) -Wall -W -Wno-parentheses
CC=gcc
-INCFLAGS=-I../../lib/igb
+INCFLAGS=-I../../lib/igb -I../../daemons/mrpd -I../common
LDLIBS=-ligb -lpci -lz -lrt -lm -pthread
LDFLAGS=-L../../lib/igb
all: simple_talker
-simple_talker: simple_talker.o talker_mrp_client.o
+simple_talker: simple_talker.o ../common/talker_mrp_client.o
simple_talker.o: simple_talker.c
- gcc -c $(INCFLAGS) -I../../daemons/mrpd $(CFLAGS) simple_talker.c
+ gcc -c $(INCFLAGS) $(CFLAGS) simple_talker.c
-talker_mrp_client.o: talker_mrp_client.c
- gcc -c $(INCFLAGS) -I../../daemons/mrpd $(CFLAGS) talker_mrp_client.c
+../common/talker_mrp_client.o:
+ make -C ../common/ talker_mrp_client.o
%: %.o
$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
clean:
rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"` simple_talker
+ rm -f ../common/talker_mrp_client.o