diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-16 14:31:31 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-16 14:31:31 +0100 |
| commit | dec9693d8437a31dab8e4010b33b57e1476a315c (patch) | |
| tree | f4877973363fee5c1b381f83bd1fd51d1cc472ce /lib/service/Makefile.am | |
| parent | cdb8a973f09efb2d42875d7854edba9a411719ff (diff) | |
| parent | 266b7db4f7e4a369206551e62df43e9a29edbeff (diff) | |
| download | enigma2-dec9693d8437a31dab8e4010b33b57e1476a315c.tar.gz enigma2-dec9693d8437a31dab8e4010b33b57e1476a315c.zip | |
Merge branch 'bug_124_m2ts_support'
Conflicts:
lib/dvb/pmt.cpp
lib/service/Makefile.am
Diffstat (limited to 'lib/service/Makefile.am')
| -rw-r--r-- | lib/service/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am index edafd1a2..9f956b66 100644 --- a/lib/service/Makefile.am +++ b/lib/service/Makefile.am @@ -16,7 +16,8 @@ libenigma_service_a_SOURCES = \ servicedvb.cpp \ servicedvbrecord.cpp \ servicefs.cpp \ - servicemp3.cpp + servicemp3.cpp \ + servicem2ts.cpp serviceincludedir = $(pkgincludedir)/lib/service serviceinclude_HEADERS = \ @@ -27,7 +28,8 @@ serviceinclude_HEADERS = \ servicedvb.h \ servicedvbrecord.h \ servicefs.h \ - servicemp3.h + servicemp3.h \ + servicem2ts.h if HAVE_LIBXINE libenigma_service_a_SOURCES += \ |