diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-12-28 03:10:15 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-12-28 03:32:39 +0800 |
| commit | 59bd81691def7f7f8c0ead2edaacd374b6791067 (patch) | |
| tree | e09951e7f35561f573fc56a50f42c706ac25aae5 /calendar | |
| parent | 6a074300e533a82fb1a09b470724e54b155f8cd5 (diff) | |
| download | gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.gz gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.zst gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.zip | |
Compiler and linker flag cleanups.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/conduits/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 6 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 5 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 1 | ||||
| -rw-r--r-- | calendar/importers/Makefile.am | 4 |
5 files changed, 11 insertions, 7 deletions
diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am index 430168130f..27abb0962a 100644 --- a/calendar/conduits/Makefile.am +++ b/calendar/conduits/Makefile.am @@ -1,5 +1,3 @@ SUBDIRS = common calendar memo todo - - -include $(top_srcdir)/git.mk diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 7d2e1f564b..5c3f4579e8 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -224,10 +224,10 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) \ - $(LIBSOUP_LIBS) \ $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) + $(LIBSOUP_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index e861267d1e..44e0187180 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -9,6 +9,8 @@ evolution_alarm_notify_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ + $(CAMEL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(CANBERRA_CFLAGS) @@ -36,7 +38,8 @@ evolution_alarm_notify_LDADD = \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) \ - $(CANBERRA_LIBS) + $(CANBERRA_LIBS) \ + $(GNOME_PLATFORM_LIBS) if OS_WIN32 evolution_alarm_notify_LDFLAGS = -mwindows diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 8b7c456156..7b0be1b6bd 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -49,6 +49,7 @@ ecalendarinclude_HEADERS = \ libcal_dialogs_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ + $(CAMEL_LIBS) \ $(GNOME_PLATFORM_LIBS) libcal_dialogs_la_SOURCES = \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index e1788106ab..a5274b60e1 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -7,6 +7,7 @@ libevolution_calendar_importers_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ -I$(top_builddir)/calendar \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) libevolution_calendar_importers_la_SOURCES = \ @@ -18,6 +19,7 @@ libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ - $(EVOLUTION_CALENDAR_LIBS) + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) -include $(top_srcdir)/git.mk |