X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2FMakefile.am;h=891b646a090e3062942bd9028ee3782ebdf83b9d;hp=68bde79502317780abbc87b814f39b32185d657f;hb=875b117b3aeca1af73942d4eeb691496f6c884f9;hpb=306bdc11b9e1bfa625bc57c51edc8fd042d0ba9d

diff --git a/main/Makefile.am b/main/Makefile.am
index 68bde79..891b646 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -6,6 +6,8 @@ bin_PROGRAMS = enigma2
 enigma2_SOURCES = \
 	enigma.cpp bsod.cpp
 
+CLEANFILES = version.h
+
 bsod.o: version.h
 
 enigma.o: version.h
@@ -17,7 +19,7 @@ enigma.o: version.h
 
 # this depends on Entries and not on Tag because Tag isn't always there.
 # Entries, however, will change then Tag is changed, so everything is fine.
-version.h: ../CVS/Entries ../CVS/Root
+version.h: # ../CVS/Entries ../CVS/Root
 	> version.h
 	if [ -f ../CVS/Tag ]; then echo "#define ENIGMA2_CHECKOUT_TAG \"`cat ../CVS/Tag`\"" >> version.h; fi
 	if [ -f ../CVS/Root ]; then echo "#define ENIGMA2_CHECKOUT_ROOT \"`cat ../CVS/Root`\"" >> version.h; fi
@@ -27,27 +29,31 @@ enigma2_LDADD_WHOLE = \
 	$(top_builddir)/lib/base/libenigma_base.a \
 	$(top_builddir)/lib/components/libenigma_components.a \
 	$(top_builddir)/lib/driver/libenigma_driver.a \
+	$(top_builddir)/lib/mmi/libenigma_mmi.a \
 	$(top_builddir)/lib/dvb/libenigma_dvb.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/service/libenigma_service.a \
-	$(top_builddir)/lib/xml/libenigma_xml.a
+	$(top_builddir)/lib/service/libenigma_service.a
 
 enigma2_LDADD = \
 	@FREETYPE_LIBS@ \
 	@ID3TAG_LIBS@ \
 	@MAD_LIBS@ \
 	@PNG_LIBS@ \
+	@SDL_LIBS@ \
 	@SIGC_LIBS@ \
 	@DVBSI_LIBS@ \
 	@FRIBIDI_LIBS@ \
 	@GSTREAMER_LIBS@ \
+	@GSTREAMERPBUTILS_LIBS@ \
 	@JPEG_LIBS@ \
 	@LIBUNGIF_LIBS@ \
-	-ldl -lpthread -lcrypt -lresolv -lxml2
+	@XML2_LIBS@ \
+	@XMLCCWRAP_LIBS@ \
+	-ldl -lpthread -lcrypt -lresolv -lrt
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 #	@rm -f enigma2$(EXEEXT)