[xbuild] Use the env var $MSBuildExtensionsPath before trying other paths.

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

diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am
index a1396611cb2ce098a5339b5b23a60b9f742188cf..6ef2c53ac659b4a6f33228a041cbfda9213bf553 100644 (file)
--- a/eglib/src/Makefile.am
+++ b/eglib/src/Makefile.am
@@ -1,6 +1,7 @@
-noinst_LTLIBRARIES = libeglib.la
+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,17 +9,26 @@ unix_files = \
        gdate-unix.c  gdir-unix.c  gfile-unix.c  gmisc-unix.c   \
        gmodule-unix.c gtimer-unix.c
 
-if PLATFORM_WIN32
+# 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
 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    \
        gmem.c          \
@@ -39,18 +49,23 @@ libeglib_la_SOURCES = \
        gmarkup.c       \
        gutf8.c         \
        gunicode.c      \
-       $(os_files)
+       unicode-data.h  \
+       $(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)
 
-if PLATFORM_WIN32
-libeglib_la_LIBADD = -lm -liconv -lpsapi
-else
-libeglib_la_LIBADD = -lm
+if HOST_WIN32
+libeglib_la_LIBADD = -lm $(ICONV_LIBS) -lpsapi
 endif
 
+libeglib_static_la_LIBADD = $(libeglib_la_LIBADD)
+libeglib_static_la_LDFLAGS = -static
+
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = eglib-config.h.in $(win_files) $(unix_files)