add enq cancel

[enigma2.git] / main / Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index ad838f5fd280d23d752fb69ef92bda8064f73bb3..dad2b33d7f933e28b8613e880f6786a2e13e7a49 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = \
-       -I$(top_srcdir)/include \
-       -I/usr/include/python2.3
+       -I$(top_srcdir)/include
 
 bin_PROGRAMS = enigma2
 
@@ -13,7 +12,7 @@ enigma2_LDADD_WHOLE = \
        $(top_builddir)/lib/components/libenigma_components.a \
        $(top_builddir)/lib/driver/libenigma_driver.a \
        $(top_builddir)/lib/dvb/libenigma_dvb.a \
-       $(top_builddir)/lib/dvb_si/libenigma_dvb_si.a \
+       $(top_builddir)/lib/dvb_ci/libenigma_dvb_ci.a \
        $(top_builddir)/lib/gdi/libenigma_gdi.a \
        $(top_builddir)/lib/gui/libenigma_gui.a \
        $(top_builddir)/lib/python/libenigma_python.a \
@@ -27,10 +26,10 @@ enigma2_LDADD = \
        @MAD_LIBS@ \
        @PNG_LIBS@ \
        @SIGC_LIBS@ \
-       @SDL_LIBS@ \
-       -ldl -lpthread -lcrypt -lresolv -lpython2.3
+       @DVBSI_LIBS@ \
+       -ldl -lpthread -lcrypt -lresolv -lpython2.4
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
-       @rm -f enigma2$(EXEEXT)
-#      $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
-       g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
+#      @rm -f enigma2$(EXEEXT)
+       $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
+#      g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)