diff options
| author | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
| commit | 8650fb139a9143f04615de74ff569bce3e0c4ce3 (patch) | |
| tree | 89a41d08f179a5359b8eaee0c9344b8a5bf07cb3 /calendar | |
| parent | 04b7c97275ae420dca43f3e65c2ef54d02f01bdd (diff) | |
| download | gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.gz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.bz2 gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.lz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.xz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.zst gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.zip | |
Bug 540362: [webkit-composer] Use webkit for composer
Merge wip/webkit-composer branch into master.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/alarm-notify/Makefile.am | 8 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 6 | ||||
| -rw-r--r-- | calendar/importers/Makefile.am | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index 057ac6a9a4..ecd24afa43 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -21,8 +21,8 @@ evolution_alarm_notify_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(CANBERRA_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) ui_DATA = \ alarm-notify.ui @@ -55,8 +55,8 @@ evolution_alarm_notify_LDADD = \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ $(CANBERRA_LIBS) \ - $(GTKHTML_LIBS) - $(EVOLUTIONALARMNOTIFYICON) + $(EVOLUTIONALARMNOTIFYICON) \ + $(NULL) evolution_alarm_notify_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index de752c11d4..2dca7d50bd 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -67,9 +67,9 @@ libevolution_calendar_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) etspec_DATA = \ e-calendar-table.etspec \ @@ -207,8 +207,8 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(LIBSOUP_LIBS) + $(LIBSOUP_LIBS) \ + $(NULL) libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 9c7b3053a2..ec5afaa7a2 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -14,8 +14,8 @@ libcal_dialogs_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs @@ -52,7 +52,7 @@ libcal_dialogs_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) libcal_dialogs_la_SOURCES = \ alarm-dialog.c \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 206a852f4c..957de01280 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -9,8 +9,8 @@ libevolution_calendar_importers_la_CPPFLAGS = \ -I$(top_builddir)/calendar \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) libevolution_calendar_importers_la_SOURCES = \ evolution-calendar-importer.h \ @@ -23,6 +23,6 @@ libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) -include $(top_srcdir)/git.mk |