aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--calendar/cal-client/Makefile.am4
-rw-r--r--calendar/cal-util/Makefile.am20
-rw-r--r--calendar/gui/Makefile.am8
-rw-r--r--calendar/pcs/Makefile.am5
-rw-r--r--mail/Makefile.am1
-rw-r--r--widgets/e-text/Makefile.am1
7 files changed, 26 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index a4ade3f5ac..c8bf478737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-17 Elliot Lee <sopwith@redhat.com>
+ * calendar/cal-client/Makefile.am,
+ calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
+ calendar/pcs/Makefile.am, mail/Makefile.am,
+ widgets/e-text/Makefile.am: Fix for srcdir != builddir.
+
2000-03-14 Dan Winship <danw@helixcode.com>
* Makefile.am (SUBDIRS): build shell before mail, since mail
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 81d4440a7f..a114d589bd 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -19,7 +19,7 @@ $(CORBA_GENERATED): $(idls)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"cal-client\" \
- -I$(top_srcdir)/calendar/cal-util \
+ -I$(top_srcdir)/calendar \
-I$(srcdir) -I$(top_srcdir) \
-I. \
-I.. \
@@ -56,7 +56,7 @@ client_test_INCLUDES = \
client_test_LDADD = \
$(BONOBO_VFS_GNOME_LIBS) \
- $(top_srcdir)/calendar/cal-util/libcalutil.la \
+ $(top_builddir)/calendar/cal-util/libcalutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical.la \
libcal-client.la
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index e6e34388af..8a866efd49 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -1,15 +1,13 @@
-
-#INCLUDES = \
-# -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-# -DG_LOG_DOMAIN=\"cal-client\" \
-# -I$(srcdir) -I$(top_srcdir) \
-# -I. \
-# -I.. \
-# -I$(top_builddir) \
-# -I$(includedir) \
-# $(GNOME_INCLUDEDIR)
-
+INCLUDES = \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DG_LOG_DOMAIN=\"cal-client\" \
+ -I$(srcdir) -I$(top_srcdir) \
+ -I. \
+ -I.. \
+ -I$(top_builddir) \
+ -I$(includedir) \
+ $(GNOME_INCLUDEDIR)
lib_LTLIBRARIES = libcalutil.la
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index f3c3e077aa..d5e4bdbfde 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = gnomecal
# calendar-pilot-sync
#endif
-ICAL_LINK_FLAGS = $(top_srcdir)/libical/src/libical/libical.la
+ICAL_LINK_FLAGS = $(top_builddir)/libical/src/libical/libical.la
INCLUDES = \
-I$(includedir) \
@@ -72,10 +72,10 @@ gnomecal_SOURCES = \
LINK_FLAGS = \
$(BONOBO_VFS_GNOME_LIBS) \
$(INTLLIBS) \
- $(top_srcdir)/calendar/cal-util/libcalutil.la \
- $(top_srcdir)/libversit/libversit.la \
+ $(top_builddir)/calendar/cal-util/libcalutil.la \
+ $(top_builddir)/libversit/libversit.la \
$(ICAL_LINK_FLAGS) \
- $(top_srcdir)/calendar/cal-client/libcal-client.la
+ $(top_builddir)/calendar/cal-client/libcal-client.la
#calendar_pilot_sync_LDADD = \
# $(PISOCK_LIBDIR) $(PISOCK_LIBS) \
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 6db6862a0f..269ba2f5c6 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -14,6 +14,7 @@ bin_PROGRAMS = tlacuache
# $(GNOME_INCLUDEDIR)
INCLUDES = \
+ -I$(top_srcdir) \
-I$(top_srcdir)/calendar/cal-client \
-I$(top_srcdir)/calendar/cal-util \
-I$(top_srcdir)/calendar \
@@ -69,8 +70,8 @@ ICAL_LINK_FLAGS = $(top_builddir)/libical/src/libical/libical.la
tlacuache_LDADD = \
$(BONOBO_VFS_GNOME_LIBS) \
- $(top_srcdir)/calendar/cal-util/libcalutil.la \
- $(top_srcdir)/libversit/libversit.la \
+ $(top_builddir)/calendar/cal-util/libcalutil.la \
+ $(top_builddir)/libversit/libversit.la \
$(ICAL_LINK_FLAGS)
gnorbadir = $(sysconfdir)/CORBA/servers
diff --git a/mail/Makefile.am b/mail/Makefile.am
index a7421d27e8..fec2e6f329 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir) \
+ -I$(top_builddir)/shell \
$(BONOBO_HTML_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
diff --git a/widgets/e-text/Makefile.am b/widgets/e-text/Makefile.am
index 60963c9727..e7cc4ea7e1 100644
--- a/widgets/e-text/Makefile.am
+++ b/widgets/e-text/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = \
+ -I$(top_srcdir) \
$(GNOME_INCLUDEDIR)
noinst_LIBRARIES = \