X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54bd4123728628a6f77bad2584b70d1353a91666..6d1b9345ba2d42a89aa6bb04a56a91983972c3b7:/main/Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index a8ecca4f..dad2b33d 100644
--- 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
 
@@ -8,11 +7,12 @@ enigma2_SOURCES = \
 	enigma.cpp 
 
 enigma2_LDADD_WHOLE = \
+	$(top_builddir)/lib/actions/libenigma_actions.a \
 	$(top_builddir)/lib/base/libenigma_base.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 \
@@ -26,8 +26,10 @@ enigma2_LDADD = \
 	@MAD_LIBS@ \
 	@PNG_LIBS@ \
 	@SIGC_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)
+#	@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)