X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=main%2FMakefile.am;h=5a7d1ef79700155111d7190d259b82ac053f6362;hb=4ebd765cac9f8a7ae4934147ed876a9e228eeb8d;hp=ff99797d651a1229facc8d05480f8192bf270e34;hpb=1aeefd997cc362c3b37c1587c5f08891b35c3a75;p=vuplus_dvbapp

diff --git a/main/Makefile.am b/main/Makefile.am
index ff99797..5a7d1ef 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I/usr/include/python2.3
 
 bin_PROGRAMS = enigma2
 
@@ -7,26 +8,29 @@ enigma2_SOURCES = \
 	enigma.cpp 
 
 enigma2_LDADD_WHOLE = \
+	$(top_builddir)/lib/actions/libenigma_actions.a \
 	$(top_builddir)/lib/base/libenigma_base.a \
-	$(top_builddir)/lib/content/libenigma_content.a \
+	$(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 \
 	$(top_builddir)/lib/nav/libenigma_nav.a \
 	$(top_builddir)/lib/network/libenigma_network.a \
 	$(top_builddir)/lib/service/libenigma_service.a
 
 enigma2_LDADD = \
 	@FREETYPE_LIBS@ \
-	@XMLTREE_LIBS@ \
 	@ID3TAG_LIBS@ \
 	@MAD_LIBS@ \
 	@PNG_LIBS@ \
 	@SIGC_LIBS@ \
-	-ldl -lpthread -lcrypt -lresolv
+	-ldl -lpthread -lcrypt -lresolv -lpython2.4
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
-	@rm -f enigma2$(EXEEXT)
+#	@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)