add am_iconv.h

5 files changed, 6 insertions, 7 deletions

diff --git a/Android.mk b/Android.mk
index b73c42b..6d16e7c 100755
--- a/Android.mk
+++ b/Android.mk
@@ -11,8 +11,7 @@ LOCAL_SRC_FILES := src/bit_slicer.c src/cache.c src/caption.c src/conv.c src/dvb
 
 LOCAL_CFLAGS+=-D_REENTRANT -D_GNU_SOURCE -DENABLE_DVB=1 -DENABLE_V4L=1 -DENABLE_V4L2=1 -DHAVE_ICONV=1 -DPACKAGE=\"zvbi\" -DVERSION=\"0.2.33\" -DANDROID
 LOCAL_ARM_MODE := arm
-LOCAL_C_INCLUDES := external/dvb/include/am_adp\
-	external/icu4c/common
+LOCAL_C_INCLUDES := external/icu4c/common
 
 LOCAL_SHARED_LIBRARIES += libicuuc liblog
 
@@ -20,4 +19,4 @@ LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
 include $(LOCAL_PATH)/ntsc_decode/Android.mk
-#include $(LOCAL_PATH)/test/Android.mk
\ No newline at end of file
+#include $(LOCAL_PATH)/test/Android.mk
diff --git a/src/conv.c b/src/conv.c
index b950ec4..c9784f1 100755
--- a/src/conv.c
+++ b/src/conv.c
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_ICONV
 
-#  include <am_iconv.h>
+#include "am_iconv.h"
 
 struct _vbi_iconv_t {
 	iconv_t			icd;
diff --git a/src/exp-html.c b/src/exp-html.c
index 42c08ce..8b273db 100755
--- a/src/exp-html.c
+++ b/src/exp-html.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <am_iconv.h>
 
+#include "am_iconv.h"
 #include "lang.h"
 #include "export.h"
 #include "teletext_decoder.h"
diff --git a/src/exp-txt.c b/src/exp-txt.c
index f4f0775..d7b96b1 100755
--- a/src/exp-txt.c
+++ b/src/exp-txt.c
@@ -26,8 +26,8 @@
 #endif
 
 #include <limits.h>
-#include <am_iconv.h>
 
+#include "am_iconv.h"
 #include "misc.h"
 #include "lang.h"
 #include "export.h"
diff --git a/src/export.c b/src/export.c
index 54fbda3..1204885 100755
--- a/src/export.c
+++ b/src/export.c
@@ -34,8 +34,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <am_iconv.h>
 
+#include "am_iconv.h"
 #include "export.h"
 #include "conv.h"
 #include "vbi.h" /* asprintf */