diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | examples/common/Makefile | 7 | ||||
| -rw-r--r-- | examples/jackd-talker/Makefile | 8 | ||||
| -rw-r--r-- | examples/live_stream/Makefile | 10 | ||||
| -rw-r--r-- | examples/simple_talker/Makefile | 8 | ||||
| -rw-r--r-- | lib/common/Makefile | 12 | ||||
| -rw-r--r-- | lib/common/avb.c (renamed from examples/common/avb.c) | 0 | ||||
| -rw-r--r-- | lib/common/avb.h (renamed from examples/common/avb.h) | 0 |
8 files changed, 28 insertions, 18 deletions
@@ -40,6 +40,7 @@ igb_clean: lib: FORCE $(call descend,lib/igb) + $(call descend,lib/common) lib_clean: $(call descend,lib/igb/,clean) diff --git a/examples/common/Makefile b/examples/common/Makefile index 55d824fb..5e42ddbd 100644 --- a/examples/common/Makefile +++ b/examples/common/Makefile @@ -2,10 +2,7 @@ CC ?= gcc OPT = -O2 -g CFLAGS = $(OPT) -Wall -Wextra -Wno-parentheses -all: avb.o talker_mrp_client.o listener_mrp_client.o - -avb.o: avb.c avb.h - $(CC) $(CFLAGS) -I../../lib/igb -c avb.c +all: talker_mrp_client.o listener_mrp_client.o talker_mrp_client.o: talker_mrp_client.c talker_mrp_client.h $(CC) $(CFLAGS) -I../../daemons/mrpd -I../../daemons/common -c talker_mrp_client.c @@ -14,5 +11,5 @@ listener_mrp_client.o: listener_mrp_client.c listener_mrp_client.h $(CC) $(CFLAGS) -I../../daemons/mrpd -I../../daemons/common -c listener_mrp_client.c clean: - $(RM) avb.o talker_mrp_client.o listener_mrp_client.o + $(RM) talker_mrp_client.o listener_mrp_client.o $(RM) `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"` diff --git a/examples/jackd-talker/Makefile b/examples/jackd-talker/Makefile index e38f9f5d..f76bf2e0 100644 --- a/examples/jackd-talker/Makefile +++ b/examples/jackd-talker/Makefile @@ -1,13 +1,13 @@ CC ?= gcc OPT = -O2 -g CFLAGS = $(OPT) $(INCFLAGS) -Wall -Wextra -Wno-parentheses -std=gnu99 -INCFLAGS = -I../../lib/igb -I../../daemons/mrpd -I../common -I../../daemons/common +INCFLAGS = -I../../lib/igb -I../../daemons/mrpd -I../common -I../../lib/common -I../../daemons/common LDLIBS = -ligb -lpci -lrt -pthread -ljack LDFLAGS = -L../../lib/igb all: jackd_talker -jackd_talker: jackd_talker.o jack.o ../common/talker_mrp_client.o ../common/avb.o +jackd_talker: jackd_talker.o jack.o ../common/talker_mrp_client.o ../../lib/common/avb.o jack.o: jack.c jack.h defines.h $(CC) $(CFLAGS) -c jack.c @@ -15,8 +15,8 @@ jack.o: jack.c jack.h defines.h jackd_talker.o: jackd_talker.c defines.h jack.h $(CC) -c $(INCFLAGS) -I../../daemons/mrpd $(CFLAGS) jackd_talker.c -../common/avb.o: ../common/avb.c ../common/avb.h - make -C ../common/ avb.o +../../lib/common/avb.o: ../../lib/common/avb.c ../../lib/common/avb.h + make -C ../../lib/common/ avb.o ../common/talker_mrp_client.o: make -C ../common/ talker_mrp_client.o diff --git a/examples/live_stream/Makefile b/examples/live_stream/Makefile index 559d1226..4eb4feed 100644 --- a/examples/live_stream/Makefile +++ b/examples/live_stream/Makefile @@ -1,13 +1,13 @@ CC?=gcc OPT=-O2 -g CFLAGS=$(OPT) -Wall -Wextra -Wno-parentheses -INCFLAGS=-I ../../lib/igb/ -I../../daemons/mrpd -I../common -I../../daemons/common +INCFLAGS=-I ../../lib/igb/ -I../../daemons/mrpd -I../common -I../../lib/common -I../../daemons/common LDLIBS=-ligb -lpci -lrt -lpthread LDFLAGS=-L ../../lib/igb/ all: talker listener -talker: talker.o ../common/avb.o ../common/talker_mrp_client.o +talker: talker.o ../../lib/common/avb.o ../common/talker_mrp_client.o talker.o: talker.c $(CC) $(CFLAGS) $(INCFLAGS) $(EXTRA_FLAGS) -c talker.c @@ -15,7 +15,7 @@ talker.o: talker.c ../common/talker_mrp_client.o: ../common/talker_mrp_client.c ../common/talker_mrp_client.h make -C ../common/ talker_mrp_client.o -listener: listener.o ../common/avb.o ../common/listener_mrp_client.o +listener: listener.o ../../lib/common/avb.o ../common/listener_mrp_client.o listener.o: listener.c $(CC) $(CFLAGS) $(INCFLAGS) $(EXTRA_FLAGS) -c listener.c @@ -23,8 +23,8 @@ listener.o: listener.c ../common/listener_mrp_client.o: ../common/listener_mrp_client.c ../common/listener_mrp_client.h make -C ../common/ listener_mrp_client.o -../common/avb.o: ../common/avb.c ../common/avb.h - make -C ../common/ avb.o +../../lib/common/avb.o: ../../lib/common/avb.c ../../lib/common/avb.h + make -C ../../lib/common/ avb.o %: %.o $(CC) $(LDFLAGS) $^ $(LDLIBS) $(EXTRA_FLAGS) -o $@ diff --git a/examples/simple_talker/Makefile b/examples/simple_talker/Makefile index 5b1bc971..bba47b03 100644 --- a/examples/simple_talker/Makefile +++ b/examples/simple_talker/Makefile @@ -1,19 +1,19 @@ CC?=gcc OPT=-O2 -g CFLAGS=$(OPT) -Wall -Wextra -Wno-parentheses -INCFLAGS=-I../../lib/igb -I../../daemons/mrpd -I../common -I../../daemons/common +INCFLAGS=-I../../lib/igb -I../../daemons/mrpd -I../common -I../../lib/common -I../../daemons/common LDLIBS=-ligb -lpci -lrt -lm -pthread LDFLAGS=-L../../lib/igb all: simple_talker -simple_talker: simple_talker.o ../common/talker_mrp_client.o ../common/avb.o +simple_talker: simple_talker.o ../common/talker_mrp_client.o ../../lib/common/avb.o simple_talker.o: simple_talker.c $(CC) $(CFLAGS) $(INCFLAGS) -c simple_talker.c -../common/avb.o: ../common/avb.h ../common/avb.c - make -C ../common/ avb.o +../../lib/common/avb.o: ../../lib/common/avb.h ../../lib/common/avb.c + make -C ../../lib/common/ avb.o ../common/talker_mrp_client.o: ../common/talker_mrp_client.c ../common/talker_mrp_client.h make -C ../common/ talker_mrp_client.o diff --git a/lib/common/Makefile b/lib/common/Makefile new file mode 100644 index 00000000..4621bbf2 --- /dev/null +++ b/lib/common/Makefile @@ -0,0 +1,12 @@ +CC ?= gcc +OPT = -O2 -g +CFLAGS = $(OPT) -Wall -Wextra -Wno-parentheses + +all: avb.o + +avb.o: avb.c avb.h + $(CC) $(CFLAGS) -I../igb -c avb.c + +clean: + $(RM) avb.o talker_mrp_client.o listener_mrp_client.o + $(RM) `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"` diff --git a/examples/common/avb.c b/lib/common/avb.c index 4cdf56de..4cdf56de 100644 --- a/examples/common/avb.c +++ b/lib/common/avb.c diff --git a/examples/common/avb.h b/lib/common/avb.h index 6ff7a087..6ff7a087 100644 --- a/examples/common/avb.h +++ b/lib/common/avb.h |