diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-06-08 12:41:46 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-06-08 12:41:46 +0800 |
| commit | e1ef78b8f4d27c83c4d281bf18980b9acf8568b7 (patch) | |
| tree | b3e7887b8f02b30754c2cbb03f65a28f0a510537 /addressbook | |
| parent | 104a3d0bffd91508ef184487aa9fbc0826cc6177 (diff) | |
| download | gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.tar gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.tar.gz gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.tar.bz2 gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.tar.lz gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.tar.xz gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.tar.zst gsoc2013-evolution-e1ef78b8f4d27c83c4d281bf18980b9acf8568b7.zip | |
Fix Makefiles so that (guess what?) they work with builddir != srcdir.
svn path=/trunk/; revision=3474
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/contact-editor/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/gui/minicard/Makefile.am | 24 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 24 |
5 files changed, 38 insertions, 26 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 2b1f8ab0b6..0da4223475 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2000-06-08 Ettore Perazzoli <ettore@helixcode.com> + + * contact-editor/Makefile.am (contact_editor_test_LDADD): Remove + the `$(srcdir)/' prefix from `libecontacteditor.a' because [of + course] the library is built in the build directory, not in the + source directory. + * gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with + `libeminicard.a'. + (minicard_label_test_LDADD): Likewise. + (reflow_test_LDADD): Likewise. + (minicard_view_test_LDADD): Likewise. + 2000-06-06 Christopher James Lahey <clahey@helixcode.com> * gui/component/addressbook.c: Bind right click on the ETable to diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am index 1724edf699..1ed9f8b0c3 100644 --- a/addressbook/contact-editor/Makefile.am +++ b/addressbook/contact-editor/Makefile.am @@ -30,7 +30,7 @@ contact_editor_test_SOURCES = \ test-editor.c contact_editor_test_LDADD = \ - $(srcdir)/libecontacteditor.a \ + libecontacteditor.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/addressbook/ename/libename.la \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 1724edf699..1ed9f8b0c3 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -30,7 +30,7 @@ contact_editor_test_SOURCES = \ test-editor.c contact_editor_test_LDADD = \ - $(srcdir)/libecontacteditor.a \ + libecontacteditor.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/addressbook/ename/libename.la \ diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am index 7a42e8372a..2f9cfdf776 100644 --- a/addressbook/gui/minicard/Makefile.am +++ b/addressbook/gui/minicard/Makefile.am @@ -34,8 +34,8 @@ minicard_label_test_SOURCES = \ minicard_label_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(srcdir)/libeminicard.a \ - $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a @@ -45,8 +45,8 @@ minicard_test_SOURCES = \ minicard_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(srcdir)/libeminicard.a \ - $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -62,15 +62,15 @@ reflow_test_SOURCES = \ reflow_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ - $(top_builddir)/widgets/e-table/libetable.a \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-table/libetable.a \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a minicard_view_test_SOURCES = \ @@ -79,13 +79,13 @@ minicard_view_test_SOURCES = \ minicard_view_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ - $(top_builddir)/widgets/e-table/libetable.a \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-table/libetable.a \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 7a42e8372a..2f9cfdf776 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -34,8 +34,8 @@ minicard_label_test_SOURCES = \ minicard_label_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(srcdir)/libeminicard.a \ - $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a @@ -45,8 +45,8 @@ minicard_test_SOURCES = \ minicard_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(srcdir)/libeminicard.a \ - $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ @@ -62,15 +62,15 @@ reflow_test_SOURCES = \ reflow_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ - $(top_builddir)/widgets/e-table/libetable.a \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-table/libetable.a \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a minicard_view_test_SOURCES = \ @@ -79,13 +79,13 @@ minicard_view_test_SOURCES = \ minicard_view_test_LDADD = \ $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(srcdir)/libeminicard.a \ + $(BONOBO_GNOME_LIBS) \ + libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ - $(top_builddir)/widgets/e-table/libetable.a \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-table/libetable.a \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a |