X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44433f650cd3e5f9f66253b74d194fcb01578595..32f4b90e3513e3cb4365e0ad1160de6e093f45d9:/main/Makefile.am?ds=sidebyside

diff --git a/main/Makefile.am b/main/Makefile.am
index ad838f5f..bcf99ca5 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
 
@@ -13,12 +12,11 @@ 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 \
 	$(top_builddir)/lib/nav/libenigma_nav.a \
-	$(top_builddir)/lib/network/libenigma_network.a \
 	$(top_builddir)/lib/service/libenigma_service.a
 
 enigma2_LDADD = \
@@ -27,10 +25,11 @@ enigma2_LDADD = \
 	@MAD_LIBS@ \
 	@PNG_LIBS@ \
 	@SIGC_LIBS@ \
-	@SDL_LIBS@ \
-	-ldl -lpthread -lcrypt -lresolv -lpython2.3
+	@DVBSI_LIBS@ \
+	@FRIBIDI_LIBS@ \
+	-ldl -lpthread -lcrypt -lresolv
 
 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)