Recurse into network path, more build fixes
authorMike Looijmans <milo-software@users.sourceforge.net>
Fri, 31 Dec 2010 16:42:51 +0000 (17:42 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Fri, 31 Dec 2010 18:21:31 +0000 (19:21 +0100)
configure.ac
lib/Makefile.am
lib/dvb/dvb.h
lib/dvb/idvb.h
main/Makefile.am

index ea06602..3201826 100644 (file)
@@ -148,6 +148,7 @@ lib/gdi/Makefile
 lib/gui/Makefile
 lib/mmi/Makefile
 lib/nav/Makefile
+lib/network/Makefile
 lib/python/Makefile
 lib/python/Components/Makefile
 lib/python/Components/Converter/Makefile
index bd89aee..e0989f5 100644 (file)
@@ -1 +1 @@
-SUBDIRS = actions base components dvb dvb_ci gdi service driver nav gui python mmi
+SUBDIRS = actions base components dvb dvb_ci gdi service driver nav gui python mmi network
index 637c0ce..f612aff 100644 (file)
@@ -258,7 +258,6 @@ public:
 
                /* iDVBPVRChannel */
        RESULT playFile(const char *file);
-       RESULT playUrl(const char *url);
        void stopFile();
 
        RESULT playSource(ePtr<iTsSource>& source, const char *priv=NULL);
index 5856a68..1bcba70 100644 (file)
@@ -604,7 +604,6 @@ public:
                
                   ok, it's going to get better. but still...*/
        virtual RESULT playFile(const char *file) = 0;
-       virtual RESULT playUrl(const char *url) = 0;
        virtual void stopFile() = 0;
        
        /* new interface */
index 4ff95a1..89af852 100644 (file)
@@ -38,7 +38,7 @@ enigma2_LDADD_WHOLE = \
        $(top_builddir)/lib/gui/libenigma_gui.a \
        $(top_builddir)/lib/python/libenigma_python.a \
        $(top_builddir)/lib/nav/libenigma_nav.a \
-       $(top_builddir)/lib/nav/libenigma_network.a \
+       $(top_builddir)/lib/network/libenigma_network.a \
        $(top_builddir)/lib/service/libenigma_service.a
 
 enigma2_LDADD = \
@@ -49,7 +49,8 @@ enigma2_LDADD = \
        @LIBXINE_LIBS@ \
        @LIBXMLCCWRAP_LIBS@ \
        @PTHREAD_LIBS@ \
-       @PYTHON_LDFLAGS@
+       @PYTHON_LDFLAGS@ \
+       -ltuxtxt32bpp -lcrypt
 
 enigma2_LDFLAGS = -Wl,--export-dynamic