Skip to content

Commit

Permalink
fix fatal error: decode/descriptor/descriptor.h: No such file or dire…
Browse files Browse the repository at this point in the history 
…ctory

rename libdvbtee/decode/descriptor/descriptor.h to
libdvbtee/decode/descriptor/descript.h to fix an
error when building an app that depends on libdvbtee:
fatal error: decode/descriptor/descriptor.h: No such file or directory

Signed-off-by: Michael Ira Krufky <[email protected]>
  • Loading branch information
@mkrufky
mkrufky committed Feb 8, 2017
1 parent c0e734e commit 07896e1
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion dvbtee/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -I../libdvbtee -I../libdvbtee_server -D__STDC_FORMAT_MACROS
AM_CXXFLAGS += -I../libdvbtee/decode -I../libdvbtee/decode/table
AM_CXXFLAGS += -I../libdvbtee/decode -I../libdvbtee/decode/table -I../libdvbtee/decode/descriptor

bin_PROGRAMS = dvbtee
dvbtee_SOURCES = dvbtee.cpp
Expand Down
2 changes: 1 addition & 1 deletion examples/parser_example/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -I../../libdvbtee -I../../libdvbtee_server
AM_CXXFLAGS += -I../../libdvbtee/decode -I../../libdvbtee/decode/table
AM_CXXFLAGS += -I../../libdvbtee/decode -I../../libdvbtee/decode/table -I../../libdvbtee/decode/descriptor

bin_PROGRAMS = dvbtee-parser
dvbtee_parser_SOURCES = parser.cpp
Expand Down
2 changes: 1 addition & 1 deletion examples/server_example/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -I../../libdvbtee -I../../libdvbtee_server
AM_CXXFLAGS += -I../../libdvbtee/decode -I../../libdvbtee/decode/table
AM_CXXFLAGS += -I../../libdvbtee/decode -I../../libdvbtee/decode/table -I../../libdvbtee/decode/descriptor

bin_PROGRAMS = dvbtee-server
dvbtee_server_SOURCES = server.cpp
Expand Down
2 changes: 1 addition & 1 deletion examples/walk_hls/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -I../../libdvbtee
AM_CXXFLAGS += -I../../libdvbtee/decode -I../../libdvbtee/decode/table
AM_CXXFLAGS += -I../../libdvbtee/decode -I../../libdvbtee/decode/table -I../../libdvbtee/decode/descriptor

bin_PROGRAMS = walk-hls
walk_hls_SOURCES = main.cpp hlsinput.cpp
Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AM_CXXFLAGS = -I./decode -I./decode/table -I/usr/include/libhdhomerun -I/usr/lib/libhdhomerun -I/opt/local/include -pthread -D__STDC_FORMAT_MACROS
AM_CXXFLAGS = -I./decode -I./decode/table -I./decode/descriptor -I/usr/include/libhdhomerun -I/usr/lib/libhdhomerun -I/opt/local/include -pthread -D__STDC_FORMAT_MACROS

lib_LTLIBRARIES = libdvbtee.la

Expand Down
4 changes: 2 additions & 2 deletions libdvbtee/decode/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ endif DRA1

EXTRA_DIST = decoder.h \
table/table.h \
descriptor/descriptor.h
descriptor/descript.h

DVBTEE_DECODE_LIBRARY_VERSION=0:0:0

Expand All @@ -104,6 +104,6 @@ libdvbtee_decode_la_LDFLAGS = -version-info $(DVBTEE_DECODE_LIBRARY_VERSION)
library_includedir=$(includedir)/dvbtee
library_include_HEADERS = decoder.h \
table/table.h \
descriptor/descriptor.h
descriptor/descript.h

libdvbtee_decode_la_LIBADD = -L../value -lvalueobj
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_0a.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <map>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_48.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <map>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_4d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <map>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_62.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <vector>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_81.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <vector>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_83.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <vector>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_86.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <vector>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_a0.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <map>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/desc_a1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <map>

#include "descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/descriptor.h → libdvbtee/decode/descriptor/descript.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* Copyright (C) 2011-2016 Michael Ira Krufky
* Copyright (C) 2011-2017 Michael Ira Krufky
*
* Author: Michael Ira Krufky <[email protected]>
*
Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/descriptor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*****************************************************************************/

#include "descriptor.h"
#include "descript.h"

#define CLASS_MODULE "DESCRIPTOR"

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee/decode/descriptor/descriptor.pri
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ HEADERS += \
$$PWD/desc_86.h \
$$PWD/desc_a0.h \
$$PWD/desc_a1.h \
$$PWD/descriptor.h
$$PWD/descript.h
2 changes: 1 addition & 1 deletion libdvbtee/decode/table/table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string>

#include "decoder.h"
#include "decode/descriptor/descriptor.h"
#include "descript.h"

namespace dvbtee {

Expand Down
2 changes: 1 addition & 1 deletion libdvbtee_server/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AM_CXXFLAGS = -I../libdvbtee -I../libdvbtee/decode -I../libdvbtee/decode/table
AM_CXXFLAGS = -I../libdvbtee -I../libdvbtee/decode -I../libdvbtee/decode/table -I../libdvbtee/decode/descriptor

lib_LTLIBRARIES = libdvbtee_server.la

Expand Down
2 changes: 1 addition & 1 deletion tunerprovider/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CXXFLAGS = -I../libdvbtee -I/usr/include/libhdhomerun
AM_CXXFLAGS += -I../libdvbtee/decode -I../libdvbtee/decode/table
AM_CXXFLAGS += -I../libdvbtee/decode -I../libdvbtee/decode/table -I../libdvbtee/decode/descriptor

lib_LTLIBRARIES = libdvbtee_tunerprovider.la

Expand Down

0 comments on commit 07896e1

Please sign in to comment.