- fix when not enough framebuffer memory available

[enigma2.git] / main / Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index 46ce98b17e35b8fd375248c8b4b6fb6728077282..5a7d1ef79700155111d7190d259b82ac053f6362 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -8,11 +8,13 @@ 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 \
@@ -22,13 +24,13 @@ enigma2_LDADD_WHOLE = \
 
 enigma2_LDADD = \
        @FREETYPE_LIBS@ \
-       @XMLTREE_LIBS@ \
        @ID3TAG_LIBS@ \
        @MAD_LIBS@ \
        @PNG_LIBS@ \
        @SIGC_LIBS@ \
-       -ldl -lpthread -lcrypt -lresolv -lpython2.3
+       -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)