diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-06-27 08:43:08 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-06-27 08:43:08 +0800 |
| commit | 624fae240b1cf5a216129d0dc2a5913f0216ae59 (patch) | |
| tree | 70fb86f66c5b0c5ee8ada12e61ea6b4cb325f0fc /calendar/gui/Makefile.am | |
| parent | 4c31da1385ab7458b0e1f8552c04a895b1c7be2d (diff) | |
| download | gsoc2013-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/gui/Makefile.am')
| -rw-r--r-- | calendar/gui/Makefile.am | 27 |
1 files changed, 21 insertions, 6 deletions
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) |