aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/contact-editor/Makefile.am2
-rw-r--r--addressbook/gui/contact-editor/Makefile.am2
-rw-r--r--addressbook/gui/minicard/Makefile.am24
-rw-r--r--addressbook/gui/widgets/Makefile.am24
-rw-r--r--libical/ChangeLog7
-rw-r--r--libical/src/libicalss/Makefile.am6
-rw-r--r--libical/src/test/Makefile.am8
8 files changed, 57 insertions, 28 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
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 4b226ac5a6..baf8b5a41c 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-08 Ettore Perazzoli <ettore@helixcode.com>
+
+ * src/test/Makefile.am (INCLUDES): Likewise.
+
+ * src/libicalss/Makefile.am (INCLUDES): Use $(srcdir) to allow
+ builddir != srcdir.
+
2000-03-17 Eric Busboom <eric@agony.qualcomm.com>
* icalstore.c Vastly improved icalstore_test.
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index 4d05257e8b..01a7fa4d9c 100644
--- a/libical/src/libicalss/Makefile.am
+++ b/libical/src/libicalss/Makefile.am
@@ -17,5 +17,9 @@ include_HEADERS =\
icalstore.h
-INCLUDES = -I../libical/
+INCLUDES = \
+ -I ../libical/ \
+ -I $(srcdir)/../libical/ \
+ -I .. \
+ -I$(srcdir)/..
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
index d82734d223..81ffff8c39 100644
--- a/libical/src/test/Makefile.am
+++ b/libical/src/test/Makefile.am
@@ -2,7 +2,13 @@
noinst_PROGRAMS = usecases copycluster regression parser findobj storage stow
LDADD = ../libical/libical.a ../libicalss/libicalss.a
-INCLUDES = -I . -I../libical -I../libicalss
+INCLUDES = \
+ -I . \
+ -I $(srcdir) \
+ -I../libical \
+ -I $(srcdir)/../libical \
+ -I../libicalss \
+ -I $(srcdir)/../libicalss
findobj_SOURCES = findobj.c
usecases_SOURCES = usecases.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 04:52:31 +0800