aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog23
-rw-r--r--calendar/common/Makefile.am13
-rw-r--r--calendar/conduits/calendar/Makefile.am2
-rw-r--r--calendar/conduits/todo/Makefile.am2
-rw-r--r--calendar/gui/Makefile.am27
-rw-r--r--calendar/gui/alarm-notify/Makefile.am1
-rw-r--r--calendar/gui/calendar-commands.c1
-rw-r--r--calendar/gui/dialogs/Makefile.am6
-rw-r--r--calendar/gui/e-cal-list-view.c1
-rw-r--r--calendar/gui/e-day-view.c1
-rw-r--r--calendar/gui/gnome-cal.c1
-rw-r--r--calendar/importers/Makefile.am5
-rw-r--r--calendar/importers/icalendar-importer.c2
13 files changed, 49 insertions, 36 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4af33ba760..75804474b6 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,26 @@
+2005-06-27 Tor Lillqvist <tml@novell.com>
+
+ * */Makefile.am: Prune unnecessary and nonexistent directories
+ from the -I options. Prune pathname macros not used in the sources
+ in that directory from the -D options. Use NO_UNDEFINED. Link with
+ all necessary libraries. On Win32 link with bootstrap libraries
+ where necessary.
+
+ * common/Makefile.am: As this is a noinst library, no use for
+ LDFLAGS or LIBADD.
+
+ * gui/Makefile.am: Use Win32-specific hack to work around MSYS
+ feature in the gconftool invokation.
+
+ * gui/calendar-commands.c: Remove superfluous inclusion of <pwd.h>.
+
+ * gui/e-cal-list-view.c
+ * gui/e-day-view.c: Remove superfluous inclusion of <gdk/gdkx.h>.
+
+ * gui/gnome-cal.c: Remove superfluous inclusion of <sys/wait.h>.
+
+ * importers/icalendar-importer.c: Use g_usleep() instead of sleep().
+
2005-06-25 Chenthill Palanisamy <pchenthill@novell.com>
* gui/dialogs/comp-editor.c:
diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am
index 2a9e84ab84..ad0b1ca2cf 100644
--- a/calendar/common/Makefile.am
+++ b/calendar/common/Makefile.am
@@ -8,21 +8,8 @@ INCLUDES = \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/a11y/calendar \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
- -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
- -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
- -DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
libevolution_calendarprivate_la_SOURCES = \
authentication.c \
authentication.h
-
-libevolution_calendarprivate_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
- $(EVOLUTION_CALENDAR_LIBS)
-
-libevolution_calendarprivate_la_LDFLAGS = -avoid-version
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 0b6f78655f..8abfc96bb1 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -11,7 +11,7 @@ privconduit_LTLIBRARIES = libecalendar_conduit.la
libecalendar_conduit_la_SOURCES = \
calendar-conduit.c
-libecalendar_conduit_la_LDFLAGS = -module -avoid-version
+libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
libecalendar_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/e-util/libeconduit.la \
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 8753a50395..9c3ae10874 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -11,7 +11,7 @@ privconduit_LTLIBRARIES = libetodo_conduit.la
libetodo_conduit_la_SOURCES = \
todo-conduit.c
-libetodo_conduit_la_LDFLAGS = -module -avoid-version
+libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
libetodo_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/e-util/libeconduit.la \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index f1463147ba..92667f7038 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,10 +1,14 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
+endif
+
## CORBA stuff
-IDLS = \
- $(top_srcdir)/composer/Evolution-Composer.idl \
+IDLS = \
+ $(top_srcdir)/composer/Evolution-Composer.idl \
$(top_srcdir)/calendar/idl/evolution-calendar.idl
-CALENDAR_IDL_GENERATED_H = \
+CALENDAR_IDL_GENERATED_H = \
evolution-calendar.h
CALENDAR_IDL_GENERATED_C = \
evolution-calendar-common.c \
@@ -56,10 +60,8 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/misc \
-I$(top_srcdir)/a11y/calendar \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
@@ -214,6 +216,7 @@ libevolution_calendar_la_SOURCES = \
weekday-picker.h
libevolution_calendar_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/widgets/menus/libmenus.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
@@ -223,9 +226,10 @@ libevolution_calendar_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la \
$(LIBSOUP_LIBS) \
+ $(CAMEL_LIBS) \
$(EVOLUTION_CALENDAR_LIBS)
-libevolution_calendar_la_LDFLAGS = -avoid-version -module
+libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
server_in_files = GNOME_Evolution_Calendar.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@@ -252,12 +256,23 @@ EXTRA_DIST = \
BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
+if OS_WIN32
+install-data-local:
+ if test -z "$(DESTDIR)"; then \
+ for p in $(schema_DATA); do \
+ (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
+ echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
+ cmd /c _temp.bat; \
+ done; \
+ fi
+else
install-data-local:
if test -z "$(DESTDIR)"; then \
for p in $(schema_DATA); do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
done; \
fi
+endif
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 2040efcc94..17e9444e83 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -23,7 +23,6 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/calendar \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 8cf9849f7d..1dcc70d3eb 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -28,7 +28,6 @@
#include <config.h>
#endif
-#include <pwd.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index a83d4ee7a2..6e72ab2141 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -4,16 +4,10 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
- -I$(top_srcdir)/calendar/cal-client \
- -I$(top_builddir)/calendar/cal-client \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/widgets/misc \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
- -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
- -DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
noinst_LTLIBRARIES = libcal-dialogs.la
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index c3bbfc6fb6..978ac6814d 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -36,7 +36,6 @@
#include <time.h>
#include <sys/stat.h>
#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 251ea52979..bfe848103a 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -36,7 +36,6 @@
#include <math.h>
#include <time.h>
#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index abd3cbb4a3..52043b4cec 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -32,7 +32,6 @@
#include <unistd.h>
#include <math.h>
#include <signal.h>
-#include <sys/wait.h>
#include <fcntl.h>
#include <glib.h>
#include <gdk/gdkkeysyms.h>
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 369ce70c75..b2c4283f85 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -3,7 +3,6 @@ importersdir = $(privlibdir)/evolution-calendar-importers
importers_LTLIBRARIES = libevolution-calendar-importers.la
INCLUDES = \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \
-DG_LOG_DOMAIN=\"Evolution-Importer\" \
-I$(top_srcdir) \
@@ -18,13 +17,13 @@ libevolution_calendar_importers_la_SOURCES = \
icalendar-importer.c \
main.c
-libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module
+libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
- $(IMPORTERS_LIBS)
+ $(EVOLUTION_CALENDAR_LIBS)
server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in
server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 082aab1bce..d52a4a8aac 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -645,7 +645,7 @@ gnome_calendar_import_data_fn (EvolutionIntelligentImporter *ii,
&& tasks_state == E_CAL_LOAD_LOADED)
break;
- sleep (1);
+ g_usleep (1000000);
}
/* If we timed out, just return. */
generated by cgit (git 2.34.1) at 2024-11-12 03:05:33 +0800