diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 3 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 24 |
2 files changed, 15 insertions, 12 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ac8a2d101f..b14f21e210 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,8 @@ 2001-01-09 Miguel de Icaza <miguel@gnu.org> + * gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME + libraries at the end to make the thing compile. + * printing/Makefile.am: Order LDADD flags correctly so it compiles. 2001-01-09 Chris Toshok <toshok@helixcode.com> diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 03bd9a4d6e..1d8fe2df52 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -53,10 +53,7 @@ minicard_test_SOURCES = \ test-minicard.c minicard_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ libeminicard.a \ - $(BONOBO_GNOME_LIBS) \ - $(GNOME_PRINT_LIBS) \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -64,15 +61,15 @@ minicard_test_LDADD = \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ $(top_builddir)/addressbook/printing/libecontactprint.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/e-util/libeutil.la + $(top_builddir)/e-util/libeutil.la \ + $(EXTRA_GNOME_LIBS) \ + $(BONOBO_GNOME_LIBS) \ + $(GNOME_PRINT_LIBS) reflow_test_SOURCES = \ test-reflow.c reflow_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(GNOME_PRINT_LIBS) \ libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ @@ -81,7 +78,10 @@ reflow_test_LDADD = \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ $(top_builddir)/addressbook/printing/libecontactprint.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/e-util/libeutil.la + $(top_builddir)/e-util/libeutil.la \ + $(EXTRA_GNOME_LIBS) \ + $(BONOBO_GNOME_LIBS) \ + $(GNOME_PRINT_LIBS) #minicard_view_test_SOURCES = \ # test-minicard-view.c @@ -103,9 +103,6 @@ minicard_widget_test_SOURCES = \ e-minicard-widget-test.c minicard_widget_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(GNOME_PRINT_LIBS) \ libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ @@ -114,7 +111,10 @@ minicard_widget_test_LDADD = \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ $(top_builddir)/addressbook/printing/libecontactprint.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/e-util/libeutil.la + $(top_builddir)/e-util/libeutil.la \ + $(EXTRA_GNOME_LIBS) \ + $(BONOBO_GNOME_LIBS) \ + $(GNOME_PRINT_LIBS) gladedir = $(datadir)/evolution/glade glade_DATA = alphabet.glade |