Attachment #234575 for bug #321303




* respect user {CC,CXX,LD}FLAGS
* fix linking order
* make job server for install phase
++ test/Makefile

	ivtv-osd-dma-test ivtv-fb-colormap-test \
	ivtv-fb-16-bit-test ps-analyzer

CFLAGS += -I../utils -D_GNU_SOURCE -Wall
CXXFLAGS += -I../utils -D_GNU_SOURCE -Wall
LDLIBS = -lm

all: $(EXES)

install:
clean: 
	rm -f *.o $(EXES)




X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder
endif

EXES := ivtv-ctl ivtv-radio $(X86_EXES)

BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl


HEADERS := linux/ivtv.h linux/ivtvfb.h

CFLAGS   += -D_GNU_SOURCE -Wall -I.
CXXFLAGS += -D_GNU_SOURCE -Wall -I.

all: $(EXES)
	$(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C ivtv-tune
	$(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C cx25840ctl

ivtv-ctl: ivtv-ctl.o
	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm

v4l2-ctl: v4l2-ctl.o
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm

v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm

ivtvplay: ivtvplay.cc
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm -lpthread

encoder.o: encoder.c
	$(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^

ivtv-encoder: enc_mindex.o enc_chann.o encoder.o
	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread

install:
	install -d $(DESTDIR)/$(HDRDIR)
	install -m 0644 $(HEADERS) $(DESTDIR)/$(HDRDIR)
	install -d $(DESTDIR)/$(BINDIR)
	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)

++ Makefile

DIRS = utils test 
	make -C utils $@
	make -C test $@

all install clean:
	for d in $(DIRS); do $(MAKE) $(MAKEOPTS) -C $$d $@ ; done

distclean: clean

Return to bug 321303

Lines 9-49 Link Here

(-)utils/Makefile.orig (-19 / +17 lines)
9	X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder	9	X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder
10	endif	10	endif
11		11
12	EXES := v4l2-ctl ivtv-ctl ivtv-radio $(X86_EXES)	12	EXES := ivtv-ctl ivtv-radio $(X86_EXES)
13		13
14	BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl	14	BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl
15		15
16		16
17	HEADERS := linux/ivtv.h linux/ivtvfb.h	17	HEADERS := linux/ivtv.h linux/ivtvfb.h
18		18
19	CFLAGS = -D_GNU_SOURCE -O2 -Wall -g -I.	19	CFLAGS += -D_GNU_SOURCE -Wall -I.
20	CXXFLAGS = $(CFLAGS)	20	CXXFLAGS += -D_GNU_SOURCE -Wall -I.
21		21
22	all:: $(EXES)	22	all: $(EXES)
23	$(MAKE) CFLAGS="$(CFLAGS)" -C ivtv-tune	23	$(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C ivtv-tune
24	$(MAKE) CFLAGS="$(CFLAGS)" -C cx25840ctl	24	$(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C cx25840ctl
25		25
26	ivtv-ctl: ivtv-ctl.o	26	ivtv-ctl: ivtv-ctl.o
27	$(CC) -lm -o $@ $^	27	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
28		28
29	v4l2-ctl: v4l2-ctl.o	29	v4l2-ctl: v4l2-ctl.o
30	$(CXX) -lm -o $@ $^	30	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm
31		31
32	v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o	32	v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o
33	$(CXX) -lm -o $@ $^	33	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm
34		34
35	ivtvplay: ivtvplay.cc	35	ivtvplay: ivtvplay.cc
36	$(CXX) $(CXXFLAGS) -lm -lpthread -o $@ $^	36	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm -lpthread
37		37
38	encoder.o: encoder.c	38	encoder.o: encoder.c
39	$(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^	39	$(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^
40		40
41	ivtv-encoder: enc_mindex.o enc_chann.o encoder.o	41	ivtv-encoder: enc_mindex.o enc_chann.o encoder.o
42	$(CC) -lpthread -o $@ $^	42	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
43		43
44	install: all	44	install:
45	install -d $(DESTDIR)/$(HDRDIR)
46	install -m 0644 $(HEADERS) $(DESTDIR)/$(HDRDIR)
47	install -d $(DESTDIR)/$(BINDIR)	45	install -d $(DESTDIR)/$(BINDIR)
48	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)	46	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)
49		47
50	-- Makefile	48	++ Makefile
Lines 1-6 Link Here
1	all clean install:	1	DIRS = utils test
2	make -C utils $@
3	make -C test $@
4		2
5	distclean: clean	3	all install clean:
		4	for d in $(DIRS); do $(MAKE) $(MAKEOPTS) -C $$d $@ ; done
6		5
		6	distclean: clean

Line Link Here

(-)file_not_specified_in_diff (-5 / +5 lines)
	* respect user {CC,CXX,LD}FLAGS		* respect user {CC,CXX,LD}FLAGS
1	* fix linking order	1	* fix linking order
2	* make job server for install phase	2	* make job server for install phase
3	-- test/Makefile	3	++ test/Makefile
Lines 7-19 Link Here
7	ivtv-osd-dma-test ivtv-fb-colormap-test \	7	ivtv-osd-dma-test ivtv-fb-colormap-test \
8	ivtv-fb-16-bit-test ps-analyzer	8	ivtv-fb-16-bit-test ps-analyzer
9		9
10	CFLAGS = -I../utils -D_GNU_SOURCE -O2 -Wall	10	CFLAGS += -I../utils -D_GNU_SOURCE -Wall
11	CXXFLAGS = $(CFLAGS)	11	CXXFLAGS += -I../utils -D_GNU_SOURCE -Wall
12	LDFLAGS = -lm	12	LDLIBS = -lm
13		13
14	all: $(EXES)	14	all: $(EXES)
15		15
16	install: all	16	install:
17	clean:	17	clean:
18	rm -f *.o $(EXES)	18	rm -f *.o $(EXES)