From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Mon, 29 Oct 2007 17:20:19 +0000 (+0000)
Subject: link e2 against shared libxmlccwrap
X-Git-Tag: 2.6.0~1779
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5b5fab0065f7b922b03b66d5b40e680a1960d1ca

link e2 against shared libxmlccwrap
this needs an OE update and installed libxmlccwrap_0.0.12-r0_mipsel.ipk
---

diff --git a/configure.ac b/configure.ac
index 0df9eb1d..fb9860c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,6 @@ lib/python/Plugins/Extensions/GraphMultiEPG/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile
-lib/xml/Makefile
 po/Makefile
 main/Makefile
 tools/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ea15f4de..de051ec9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions base components dvb dvb_ci gdi service driver nav gui python xml
+SUBDIRS = actions base components dvb dvb_ci gdi service driver nav gui python
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 25d6cb68..2bc2d75e 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -5,7 +5,7 @@
 #include <lib/dvb/epgcache.h>
 #include <lib/base/eerror.h>
 #include <lib/base/estring.h>
-#include <lib/xml/xmlccwrap.h>
+#include <xmlccwrap/xmlccwrap.h>
 #include <dvbsi++/service_description_section.h>
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/service_descriptor.h>
diff --git a/lib/xml/Makefile.am b/lib/xml/Makefile.am
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/xml/libxmlexport.cc b/lib/xml/libxmlexport.cc
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/xml/libxmlexport.h b/lib/xml/libxmlexport.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/xml/xmlccwrap.cc b/lib/xml/xmlccwrap.cc
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/xml/xmlccwrap.h b/lib/xml/xmlccwrap.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/main/Makefile.am b/main/Makefile.am
index 68bde795..42b0e01b 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -33,8 +33,7 @@ enigma2_LDADD_WHOLE = \
 	$(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@ \
@@ -47,7 +46,7 @@ enigma2_LDADD = \
 	@GSTREAMER_LIBS@ \
 	@JPEG_LIBS@ \
 	@LIBUNGIF_LIBS@ \
-	-ldl -lpthread -lcrypt -lresolv -lxml2
+	-ldl -lpthread -lcrypt -lresolv -lxml2 -lxmlccwrap
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 #	@rm -f enigma2$(EXEEXT)