X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=eglib%2Fsrc%2FMakefile.am;h=0d0e90354ee8adb5c48053a37c012ab0d0991393;hb=77394d2b6bd7b2958b53894d1afb7477f4b4da91;hp=9ec5f393567bbb515fc6445c9366c5d7a58f2ec2;hpb=13cc875a76f692a0f48f22dd24dc385f624c6fcd;p=mono.git

diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am
index 9ec5f393567..0d0e90354ee 100644
--- a/eglib/src/Makefile.am
+++ b/eglib/src/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES = libeglib.la libeglib-static.la
 
 win_files  = \
+	eglib-config.hw \
 	gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
 	gmodule-win32.c gtimer-win32.c
 
@@ -23,7 +24,6 @@ os_files = $(unix_files)
 endif
 
 libeglib_la_SOURCES = \
-	eglib-config.h	\
 	eglib-remap.h	\
 	sort.frag.h	\
 	glib.h	     	\
@@ -31,9 +31,11 @@ libeglib_la_SOURCES = \
 	gbytearray.c	\
 	gerror.c	\
 	ghashtable.c 	\
+	giconv.c	\
 	gmem.c       	\
 	gmodule.h	\
 	goutput.c    	\
+	gqsort.c	\
 	gstr.c       	\
 	gslist.c     	\
 	gstring.c    	\
@@ -57,13 +59,17 @@ libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2
 libeglib_static_la_SOURCES=$(libeglib_la_SOURCES)
 libeglib_static_la_CFLAGS = $(libeglib_la_CFLAGS)
 
-INCLUDES = -I$(srcdir)
+AM_CPPFLAGS = -I$(srcdir)
 
 if HOST_WIN32
-libeglib_la_LIBADD = -lm $(ICONV_LIBS) -lpsapi
+libeglib_la_LIBADD = -lm $(LIBICONV) -lpsapi
+else
+if PLATFORM_ANDROID
+libeglib_la_LIBADD = -llog
+endif
 endif
 
-libeglib_static_la_LIBADD = $(libeglib_la_LIBADD)
+libeglib_static_la_LIBADD = $(libeglib_la_LIBADD) $(LIBICONV)
 libeglib_static_la_LDFLAGS = -static
 
 MAINTAINERCLEANFILES = Makefile.in