Use AM_CPPFLAGS instead of INCLUDES in Makefile.am files, as the later is no longer...

[mono.git] / eglib / src / Makefile.am

diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am
index 8cd29dc293b085d6280f93aef93bff15c063060d..0d0e90354ee8adb5c48053a37c012ab0d0991393 100644 (file)
--- 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
 
@@ -8,6 +9,14 @@ unix_files = \
        gdate-unix.c  gdir-unix.c  gfile-unix.c  gmisc-unix.c   \
        gmodule-unix.c gtimer-unix.c
 
+# some unices and windows do not have an implementation of vasprintf
+# used by eglib, use provided implementation instead
+if NEED_VASPRINTF
+vasprintf_files = vasprintf.c
+else
+vaprinttf_files = foo.c
+endif
+
 if HOST_WIN32
 os_files = $(win_files)
 else
@@ -15,16 +24,18 @@ os_files = $(unix_files)
 endif
 
 libeglib_la_SOURCES = \
-       eglib-config.h  \
        eglib-remap.h   \
        sort.frag.h     \
        glib.h          \
        garray.c        \
+       gbytearray.c    \
        gerror.c        \
        ghashtable.c    \
+       giconv.c        \
        gmem.c          \
        gmodule.h       \
        goutput.c       \
+       gqsort.c        \
        gstr.c          \
        gslist.c        \
        gstring.c       \
@@ -41,19 +52,24 @@ libeglib_la_SOURCES = \
        gutf8.c         \
        gunicode.c      \
        unicode-data.h  \
-       $(os_files)
+       $(os_files)     \
+       $(vasprintf_files)
 
-libeglib_la_CFLAGS = -Wall -D_FORTIFY_SOURCE=2
+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 -liconv -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