aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/gui/Makefile.am58
-rw-r--r--calendar/gui/dialogs/Makefile.am30
-rw-r--r--configure.ac8
-rw-r--r--modules/calendar/Makefile.am2
-rw-r--r--plugins/google-account-setup/Makefile.am2
-rw-r--r--plugins/startup-wizard/Makefile.am2
6 files changed, 83 insertions, 19 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 981393f55c..c5672c2461 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -4,12 +4,53 @@ endif
SUBDIRS = alarm-notify dialogs
+privsolib_LTLIBRARIES = libevolution-calendar.la
+
ecalendarincludedir = $(privincludedir)/calendar/gui
ecalendarinclude_HEADERS = \
e-cal-config.h \
e-cal-popup.h \
- itip-utils.h
+ itip-utils.h \
+ e-attachment-handler-calendar.h \
+ calendar-config.h \
+ calendar-config-keys.h \
+ comp-util.h \
+ e-alarm-list.h \
+ e-cal-config.h \
+ e-cal-event.h \
+ e-cal-model-calendar.h \
+ e-cal-model.h \
+ e-cal-popup.h \
+ e-calendar-view.h \
+ e-cell-date-edit-text.h \
+ e-comp-editor-registry.h \
+ e-date-time-list.h \
+ e-day-view-layout.h \
+ e-day-view-main-item.h \
+ e-day-view-time-item.h \
+ e-day-view-top-item.h \
+ e-day-view.h \
+ e-meeting-attendee.h \
+ e-meeting-list-view.h \
+ e-meeting-store.h \
+ e-meeting-time-sel.h \
+ e-meeting-time-sel-item.h \
+ e-meeting-types.h \
+ e-meeting-utils.h \
+ e-select-names-editable.h \
+ e-select-names-renderer.h \
+ e-week-view-event-item.h \
+ e-week-view-layout.h \
+ e-week-view-main-item.h \
+ e-week-view-titles-item.h \
+ e-week-view.h \
+ e-timezone-entry.h \
+ goto.h \
+ itip-utils.h \
+ misc.h \
+ tag-calendar.h \
+ weekday-picker.h
search_files = tasktypes.xml memotypes.xml caltypes.xml
@@ -44,9 +85,7 @@ etspec_DATA = \
e-cal-list-view.etspec \
e-memo-table.etspec
-noinst_LTLIBRARIES = libcal-gui.la
-
-libcal_gui_la_SOURCES = \
+libevolution_calendar_la_SOURCES = \
e-attachment-handler-calendar.c \
e-attachment-handler-calendar.h \
e-calendar-view.c \
@@ -72,11 +111,8 @@ libcal_gui_la_SOURCES = \
e-cal-event.h \
e-cal-menu.c \
e-cal-menu.h \
- e-cal-model-calendar.h \
e-cal-model-calendar.c \
e-cal-model-calendar.h \
- e-cal-model-tasks.c \
- e-cal-model-tasks.h \
e-cal-model.c \
e-cal-model.h \
e-cal-popup.h \
@@ -85,6 +121,8 @@ libcal_gui_la_SOURCES = \
e-cal-list-view.h \
e-cal-model-memos.c \
e-cal-model-memos.h \
+ e-cal-model-tasks.c \
+ e-cal-model-tasks.h \
e-calendar-selector.c \
e-calendar-selector.h \
e-cell-date-edit-text.h \
@@ -103,8 +141,6 @@ libcal_gui_la_SOURCES = \
e-day-view-top-item.h \
e-day-view.c \
e-day-view.h \
- e-itip-control.h \
- e-itip-control.c \
e-meeting-attendee.c \
e-meeting-attendee.h \
e-meeting-list-view.c \
@@ -181,7 +217,7 @@ libcal_gui_la_SOURCES = \
ea-gnome-calendar.c \
ea-gnome-calendar.h
-libcal_gui_la_LIBADD = \
+libevolution_calendar_la_LIBADD = \
$(top_builddir)/composer/libcomposer.la \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
@@ -199,7 +235,7 @@ libcal_gui_la_LIBADD = \
$(CAMEL_LIBS) \
$(EVOLUTION_CALENDAR_LIBS)
-libcal_gui_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED)
@INTLTOOL_SERVER_RULE@
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index a9c752701d..87d640a6b2 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -17,7 +17,35 @@ ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
ecalendarinclude_HEADERS = \
comp-editor-page.h \
- comp-editor.h
+ comp-editor.h \
+ alarm-dialog.h \
+ alarm-list-dialog.h \
+ cal-attachment-select-file.h \
+ cal-prefs-dialog.h \
+ calendar-setup.h \
+ cancel-comp.h \
+ changed-comp.h \
+ comp-editor.h \
+ comp-editor-page.h \
+ comp-editor-util.h \
+ copy-source-dialog.h \
+ delete-comp.h \
+ delete-error.h \
+ e-delegate-dialog.h \
+ e-send-options-utils.h \
+ event-editor.h \
+ event-page.h \
+ memo-editor.h \
+ memo-page.h \
+ recurrence-page.h \
+ recur-comp.h \
+ save-comp.h \
+ schedule-page.h \
+ select-source-dialog.h \
+ send-comp.h \
+ task-editor.h \
+ task-details-page.h \
+ task-page.h
noinst_LTLIBRARIES = libcal-dialogs.la
diff --git a/configure.ac b/configure.ac
index 58fb67aa8c..e14d6cefc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,7 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
libgnomecanvas-2.0 >= libgnomecanvas_minimum_version
libgnomeui-2.0 >= libgnomeui_minimum_version
libxml-2.0 >= libxml_minimum_version
- gnome-desktop-2.0 >= gnome_desktop_minimum_version
+ gnome-desktop-2.0 >= gnome_desktop_minimum_version
shared-mime-info >= shared_mime_info_minimum_version
unique-1.0 >= unique_minimum_version])
AC_SUBST(GNOME_PLATFORM_CFLAGS)
@@ -236,8 +236,8 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
libedataserverui-$EDS_PACKAGE >= eds_minimum_version
libegroupwise-$EDS_PACKAGE >= eds_minimum_version
libebackend-$EDS_PACKAGE >= eds_minimum_version
- libgdata-$EDS_PACKAGE >= eds_minimum_version
- libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
+ libgdata-$EDS_PACKAGE >= eds_minimum_version
+ libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
dnl ******************
dnl User Documentation
@@ -1512,7 +1512,7 @@ AC_SUBST(LIBFILTER_CFLAGS)
AC_SUBST(LIBFILTER_LIBS)
dnl --- evolution (shell) flags
-EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE)
+EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 gnome-desktop-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE)
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index fa63bf53e4..8f771167d9 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -62,7 +62,7 @@ libevolution_module_calendar_la_SOURCES = \
libevolution_module_calendar_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/calendar/gui/libcal-gui.la \
+ $(top_builddir)/calendar/gui/libevolution-calendar.la \
$(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index d6d6c36cdc..3434dbb331 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -17,7 +17,7 @@ liborg_gnome_evolution_google_la_SOURCES = \
google-contacts-source.c
liborg_gnome_evolution_google_la_LIBADD = \
- $(top_builddir)/calendar/gui/libcal-gui.la \
+ $(top_builddir)/calendar/gui/libevolution-calendar.la \
$(EVOLUTION_CALENDAR_LIBS) \
$(EPLUGIN_LIBS)
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index 04de4e4e2d..39ddf0d043 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -17,7 +17,7 @@ liborg_gnome_evolution_startup_wizard_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
- $(top_builddir)/calendar/gui/libcal-gui.la \
+ $(top_builddir)/calendar/gui/libevolution-calendar.la \
$(top_builddir)/mail/libevolution-mail.la \
$(EVOLUTION_CALENDAR_LIBS) \
$(EVOLUTION_MAIL_LIBS)