Mercurial > pt1.oyama
changeset 21:b63f5c100e5a
made recpt1 link against b25 shared object.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Wed, 25 Feb 2009 22:55:34 +0900 |
parents | 669f7080a8dc |
children | 08f9a97364e0 |
files | recpt1/Makefile recpt1/decoder.h recpt1/recpt1.c |
diffstat | 3 files changed, 11 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/recpt1/Makefile Wed Feb 25 22:54:07 2009 +0900 +++ b/recpt1/Makefile Wed Feb 25 22:55:34 2009 +0900 @@ -1,53 +1,28 @@ -#!/usr/bin/make -f - -# options -B25 = -DB25 - -ifdef B25 - B25_PATH = ../arib25v023/arib25/src - B25_CLEAN = clean_b25 - B25_OBJS_EXT = $(B25_PATH)/arib_std_b25.o $(B25_PATH)/b_cas_card.o $(B25_PATH)/multi2.o $(B25_PATH)/ts_section_parser.o - PCSC_LDLIBS ?= `pkg-config libpcsclite --libs` - B25_LIBS = $(PCSC_LDLIBS) -lm -endif - PREFIX = /usr/local CC = gcc -CPPFLAGS = -I../driver -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(B25) +CPPFLAGS = -I../driver -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DB25 CFLAGS = -O2 -g -pthread + +PCSC_LIBS = `pkg-config libpcsclite --libs` +B25_LIBS = -larib25 +LIBS = $(PCSC_LIBS) $(B25_LIBS) -lm -lpthread LDFLAGS = -OBJS = recpt1.o $(B25_OBJS_EXT) decoder.o -LIBS = -lpthread +OBJS = recpt1.o decoder.o TARGET = recpt1 DEPEND = Makefile.dep all: $(TARGET) -clean: $(B25_CLEAN) +clean: rm -f $(OBJS) $(TARGET) $(DEPEND) -ifdef B25 -clean_b25: - cd $(B25_PATH); make clean -endif - $(TARGET): $(OBJS) - $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) $(B25_LIBS) + $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) $(DEPEND): $(CC) -MM $(OBJS:.o=.c) $(CPPFLAGS) > $@ -# B25_OBJS_EXT -$(B25_PATH)/arib_std_b25.o: - cd $(B25_PATH); make all -$(B25_PATH)/b_cas_card.o: - cd $(B25_PATH); make all -$(B25_PATH)/multi2.o: - cd $(B25_PATH); make all -$(B25_PATH)/ts_section_parser.o: - cd $(B25_PATH); make all - install: $(TARGET) install -m 755 $(TARGET) $(PREFIX)/bin
--- a/recpt1/decoder.h Wed Feb 25 22:54:07 2009 +0900 +++ b/recpt1/decoder.h Wed Feb 25 22:55:34 2009 +0900 @@ -1,8 +1,8 @@ #ifndef _DECODER_H_ #define _DECODER_H_ -#include "../arib25v023/arib25/src/arib_std_b25.h" -#include "../arib25v023/arib25/src/b_cas_card.h" +#include <arib25/arib_std_b25.h> +#include <arib25/b_cas_card.h> typedef struct decoder { ARIB_STD_B25 *b25;