X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=eglib%2Fsrc%2FMakefile.am;h=f89138ba851b49bb5ad317571536be5f3af3d632;hb=23a69556ded315d102337bf13971411188e26bcd;hp=70d519ea225ca26dfef7cb1376125b8c07552204;hpb=dacc3f8c5d4331f7a40413f3a802ec4049da1e2e;p=mono.git diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am index 70d519ea225..f89138ba851 100644 --- a/eglib/src/Makefile.am +++ b/eglib/src/Makefile.am @@ -1,24 +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 @@ -32,7 +24,6 @@ libeglib_la_SOURCES = \ garray.c \ gbytearray.c \ gerror.c \ - vasprintf.h \ ghashtable.c \ giconv.c \ gmem.c \ @@ -55,12 +46,9 @@ 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) AM_CPPFLAGS = -I$(srcdir) @@ -72,9 +60,6 @@ libeglib_la_LIBADD = -llog endif endif -libeglib_static_la_LIBADD = $(libeglib_la_LIBADD) $(LIBICONV) -libeglib_static_la_LDFLAGS = -static - MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = eglib-config.h.in $(win_files) $(unix_files)