projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing types and methods
[mono.git]
/
eglib
/
src
/
Makefile.am
diff --git
a/eglib/src/Makefile.am
b/eglib/src/Makefile.am
index 37f3d5fc24a950d7712b10c4b31181c0dd1d0ab3..0d0e90354ee8adb5c48053a37c012ab0d0991393 100644
(file)
--- a/
eglib/src/Makefile.am
+++ b/
eglib/src/Makefile.am
@@
-1,13
+1,22
@@
noinst_LTLIBRARIES = libeglib.la libeglib-static.la
win_files = \
noinst_LTLIBRARIES = libeglib.la libeglib-static.la
win_files = \
+ eglib-config.hw \
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
- gmodule-win32.c gtimer-win32.c
vasprintf.c
+ gmodule-win32.c gtimer-win32.c
unix_files = \
gdate-unix.c gdir-unix.c gfile-unix.c gmisc-unix.c \
gmodule-unix.c gtimer-unix.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
if HOST_WIN32
os_files = $(win_files)
else
@@
-15,16
+24,18
@@
os_files = $(unix_files)
endif
libeglib_la_SOURCES = \
endif
libeglib_la_SOURCES = \
- eglib-config.h \
eglib-remap.h \
sort.frag.h \
glib.h \
garray.c \
eglib-remap.h \
sort.frag.h \
glib.h \
garray.c \
+ gbytearray.c \
gerror.c \
ghashtable.c \
gerror.c \
ghashtable.c \
+ giconv.c \
gmem.c \
gmodule.h \
goutput.c \
gmem.c \
gmodule.h \
goutput.c \
+ gqsort.c \
gstr.c \
gslist.c \
gstring.c \
gstr.c \
gslist.c \
gstring.c \
@@
-41,19
+52,24
@@
libeglib_la_SOURCES = \
gutf8.c \
gunicode.c \
unicode-data.h \
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)
libeglib_static_la_SOURCES=$(libeglib_la_SOURCES)
libeglib_static_la_CFLAGS = $(libeglib_la_CFLAGS)
-
INCLUDE
S = -I$(srcdir)
+
AM_CPPFLAG
S = -I$(srcdir)
if HOST_WIN32
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
endif
-libeglib_static_la_LIBADD = $(libeglib_la_LIBADD)
+libeglib_static_la_LIBADD = $(libeglib_la_LIBADD)
$(LIBICONV)
libeglib_static_la_LDFLAGS = -static
MAINTAINERCLEANFILES = Makefile.in
libeglib_static_la_LDFLAGS = -static
MAINTAINERCLEANFILES = Makefile.in