diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-09-28 19:50:56 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-09-28 19:50:56 +0800 |
| commit | aaf0cb36d60c302e0e2915c9e9e3672e59a5096f (patch) | |
| tree | dcf72e5383cd1bbe51d48a442c904e16bba95705 /widgets/text | |
| parent | 52016fab4e33d48fb7dfbffbfe6db5a7c41c1bd7 (diff) | |
| download | gsoc2013-evolution-aaf0cb36d60c302e0e2915c9e9e3672e59a5096f.tar.gz gsoc2013-evolution-aaf0cb36d60c302e0e2915c9e9e3672e59a5096f.tar.zst gsoc2013-evolution-aaf0cb36d60c302e0e2915c9e9e3672e59a5096f.zip | |
On Win32, use bootstrap import library for libemiscwidgets, which hasn't
2005-09-28 Tor Lillqvist <tml@novell.com>
* text/Makefile.am: On Win32, use bootstrap import library for
libemiscwidgets, which hasn't been built yet when we come
here. Drop several overlapping CFLAGS. EXTRA_GNOME_CFLAGS
should be enough. Install in privsolib instead of privlib (no
difference on Unix). Use NO_UNDEFINED. Link with all needed
libraries to satisfy the -no-undefined used on Windows.
svn path=/trunk/; revision=30409
Diffstat (limited to 'widgets/text')
| -rw-r--r-- | widgets/text/Makefile.am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index e2c3c080ef..508178fda3 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -1,14 +1,15 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la +endif + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_INCLUDEDIR) \ - $(ICONV_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_FULL_CFLAGS) \ -DG_LOG_DOMAIN=\"e-text\" -privlib_LTLIBRARIES = libetext.la +privsolib_LTLIBRARIES = libetext.la libetext_la_SOURCES = \ e-entry.c \ @@ -35,3 +36,13 @@ libetextinclude_HEADERS = \ e-text-model.h \ e-text-model-uri.h \ e-text.h + +libetext_la_LDFLAGS = $(NO_UNDEFINED) + +libetext_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(EXTRA_GNOME_LIBS) \ + $(REGEX_LIBS) |