aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/importers
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-06-27 08:43:08 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-06-27 08:43:08 +0800
commit624fae240b1cf5a216129d0dc2a5913f0216ae59 (patch)
tree70fb86f66c5b0c5ee8ada12e61ea6b4cb325f0fc /calendar/importers
parent4c31da1385ab7458b0e1f8552c04a895b1c7be2d (diff)
downloadgsoc2013-evolution-624fae240b1cf5a216129d0dc2a5913f0216ae59.tar.gz
gsoc2013-evolution-624fae240b1cf5a216129d0dc2a5913f0216ae59.tar.zst
gsoc2013-evolution-624fae240b1cf5a216129d0dc2a5913f0216ae59.zip
Prune unnecessary and nonexistent directories from the -I options. Prune
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(). svn path=/trunk/; revision=29592
Diffstat (limited to 'calendar/importers')
-rw-r--r--calendar/importers/Makefile.am5
-rw-r--r--calendar/importers/icalendar-importer.c2
2 files changed, 3 insertions, 4 deletions
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. */