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 | |
| 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')
| -rw-r--r-- | widgets/ChangeLog | 18 | ||||
| -rw-r--r-- | widgets/text/Makefile.am | 19 |
2 files changed, 27 insertions, 10 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 1571f45c55..0047f75daa 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,16 +1,22 @@ 2005-09-28 Tor Lillqvist <tml@novell.com> * e-timezone-dialog/Makefile.am - * menus/Makefile.am: Install in privsolib instead of privlib (no - difference on Unix). Use NO_UNDEFINED. + * menus/Makefile.am + * text/Makefile.am: 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. - * e-timezone-dialog/Makefile.am: On Win32, use bootstrap import - library for libemiscwidgets, which hasn't been built yet when we - come here. Link with EVOLUTION_CALENDAR_LIBS. + * e-timezone-dialog/Makefile.am + * text/Makefile.am: On Win32, use bootstrap import library for + libemiscwidgets, which hasn't been built yet when we come + here. * menus/Makefile.am: Drop several overlapping CFLAGS, use - E_UTIL_CFLAGS instead. Link with necessary libraries. + E_UTIL_CFLAGS instead. + * text/Makefile.am: Drop several overlapping + CFLAGS. EXTRA_GNOME_CFLAGS should be enough. + 2005-08-03 Li Yuan <li.yuan@sun.com> * menus/gal-view-new-dialog.glade: 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) |