diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-12-18 17:45:15 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-18 17:45:15 +0800 |
| commit | 480464c381ad3c2e4d07ed79d933301d839778a6 (patch) | |
| tree | 6216ce476a4f4171b17383cb1eb12dc81c6248a6 | |
| parent | d332c5304fe31148f9c679455114cba5bb6ec92f (diff) | |
| download | gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.tar gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.tar.gz gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.tar.bz2 gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.tar.lz gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.tar.xz gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.tar.zst gsoc2013-evolution-480464c381ad3c2e4d07ed79d933301d839778a6.zip | |
Link with bootstrap libs on Win32. Use EVOLUTION_IMAGES instead of MAP_DIR
2005-12-18 Tor Lillqvist <tml@novell.com>
* Makefile.am: Link with bootstrap libs on Win32. Use
EVOLUTION_IMAGES instead of MAP_DIR for uniformity. Use
EVOLUTION_MAIL_CFLAGS instead of E_WIDGETS_CFLAGS. Use privsolib
instead of privlib (no difference on Unix). Use -no-undefined on
Win32. Link with all required libraries.
svn path=/trunk/; revision=30863
| -rw-r--r-- | widgets/misc/ChangeLog | 8 | ||||
| -rw-r--r-- | widgets/misc/Makefile.am | 55 |
2 files changed, 41 insertions, 22 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index b2b2152422..3e30dfc393 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,11 @@ +2005-12-18 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Link with bootstrap libs on Win32. Use + EVOLUTION_IMAGES instead of MAP_DIR for uniformity. Use + EVOLUTION_MAIL_CFLAGS instead of E_WIDGETS_CFLAGS. Use privsolib + instead of privlib (no difference on Unix). Use -no-undefined on + Win32. Link with all required libraries. + 2005-12-15 Srinivasa Ragavan <sragavan@novell.com> * e-filter-bar.c: (rule_advanced_response), (option_changed), diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 89a6aceeb1..7160328d7c 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -1,18 +1,20 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la +endif + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/a11y/widgets \ - -I$(top_srcdir)/widgets/ \ - -DMAP_DIR=\""$(imagesdir)"\" \ - -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ + -I$(top_srcdir)/widgets \ + -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ - $(E_WIDGETS_CFLAGS) \ + $(EVOLUTION_MAIL_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ $(ICONV_CFLAGS) -privlib_LTLIBRARIES = \ +privsolib_LTLIBRARIES = \ libemiscwidgets.la \ libefilterbar.la @@ -30,9 +32,6 @@ glade_DATA = e-send-options.glade \ gal-categories.glade \ e-attachment.glade -libemiscwidgets_la_LDFLAGS = $(ICONV_LIBS) - - widgetsinclude_HEADERS = \ $(pilot_headers) \ e-activity-handler.h \ @@ -130,17 +129,29 @@ libemiscwidgets_la_SOURCES = \ MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h @EVO_MARSHAL_RULE@ +libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED) + libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ $(top_builddir)/a11y/libevolution-a11y.la \ - $(E_WIDGETS_LIBS) + $(CAMEL_LIBS) \ + $(EXTRA_GNOME_LIBS) \ + $(ICONV_LIBS) libefilterbar_la_SOURCES = \ e-filter-bar.c \ e-filter-bar.h +libefilterbar_la_LDFLAGS = $(NO_UNDEFINED) + +libefilterbar_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + libemiscwidgets.la \ + $(E_WIDGETS_LIBS) + noinst_PROGRAMS = \ test-calendar \ test-dateedit \ @@ -153,9 +164,9 @@ noinst_PROGRAMS = \ test_calendar_SOURCES = \ test-calendar.c -test_calendar_LDADD = \ - ./libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ +test_calendar_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ $(E_WIDGETS_LIBS) # test-dateedit @@ -163,8 +174,8 @@ test_calendar_LDADD = \ test_dateedit_SOURCES = \ test-dateedit.c -test_dateedit_LDADD = \ - ./libemiscwidgets.la \ +test_dateedit_LDADD = \ + libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(E_WIDGETS_LIBS) @@ -173,9 +184,9 @@ test_dateedit_LDADD = \ test_dropdown_button_SOURCES = \ test-dropdown-button.c -test_dropdown_button_LDADD = \ - ./libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ +test_dropdown_button_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ $(E_WIDGETS_LIBS) # test-multi-config-dialog @@ -183,8 +194,8 @@ test_dropdown_button_LDADD = \ test_multi_config_dialog_SOURCES = \ test-multi-config-dialog.c -test_multi_config_dialog_LDADD = \ - ./libemiscwidgets.la \ +test_multi_config_dialog_LDADD = \ + libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(E_WIDGETS_LIBS) @@ -193,8 +204,8 @@ test_multi_config_dialog_LDADD = \ test_info_label_SOURCES = \ test-info-label.c -test_info_label_LDADD = \ - ./libemiscwidgets.la \ +test_info_label_LDADD = \ + libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(E_WIDGETS_LIBS) |