Merge pull request #3968 from BrzVlad/fix-monitor-exception

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

diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am
index ccdf3e63a8ec0c0835478d3a746531f398cc055d..f89138ba851b49bb5ad317571536be5f3af3d632 100644 (file)
--- a/eglib/src/Makefile.am
+++ b/eglib/src/Makefile.am
@@ -1,22 +1,16 @@
-noinst_LTLIBRARIES = libeglib.la libeglib-static.la
+noinst_LTLIBRARIES = libeglib.la
+
+AM_CFLAGS = $(WERROR_CFLAGS)
 
 win_files  = \
        eglib-config.hw \
        gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
-       gmodule-win32.c gtimer-win32.c
+       gmodule-win32.c gtimer-win32.c gunicode-win32.c
 
 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
@@ -52,21 +46,19 @@ libeglib_la_SOURCES = \
        gutf8.c         \
        gunicode.c      \
        unicode-data.h  \
-       $(os_files)     \
-       $(vasprintf_files)
+       $(os_files)
 
 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_LDFLAGS = -static
 
 MAINTAINERCLEANFILES = Makefile.in