make use of FONTDIR define instead of hardcoded fontpath

[enigma2.git] / main / Makefile.am

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