Merge pull request #1991 from esdrubal/seq_test_fix

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

diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am
index 44f311caef577ead07bf962c29b8b3af74c2031a..31771dfd9a19dab5f0af901207d869f5160264b2 100644 (file)
--- a/eglib/src/Makefile.am
+++ b/eglib/src/Makefile.am
@@ -1,4 +1,6 @@
-noinst_LTLIBRARIES = libeglib.la libeglib-static.la
+noinst_LTLIBRARIES = libeglib.la
+
+AM_CFLAGS = $(WERROR_CFLAGS)
 
 win_files  = \
        eglib-config.hw \
@@ -30,6 +32,7 @@ libeglib_la_SOURCES = \
        garray.c        \
        gbytearray.c    \
        gerror.c        \
+       vasprintf.h     \
        ghashtable.c    \
        giconv.c        \
        gmem.c          \
@@ -56,17 +59,16 @@ libeglib_la_SOURCES = \
        $(vasprintf_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 $(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