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 /addressbook | |
| 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 'addressbook')
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 18 | ||||
| -rw-r--r-- | addressbook/printing/Makefile.am | 10 | ||||
| -rw-r--r-- | addressbook/util/Makefile.am | 8 |
4 files changed, 25 insertions, 15 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 002e2f1246..8f66bbf0de 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -15,6 +15,7 @@ libecontacteditor_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) libecontacteditor_la_SOURCES = \ @@ -36,7 +37,8 @@ libecontacteditor_la_LIBADD = \ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = \ contact-editor.ui \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index c10d02a4a1..f875f3c3d7 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -14,6 +14,7 @@ libecontactlisteditor_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) libecontactlisteditor_la_SOURCES = \ @@ -24,14 +25,15 @@ libecontactlisteditor_la_SOURCES = \ libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) -libecontactlisteditor_la_LIBADD = \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) +libecontactlisteditor_la_LIBADD = \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = contact-list-editor.ui diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index 217a4288fb..04b72bfa4a 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -9,8 +9,9 @@ libecontactprint_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"addressbook-printing\" \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LTLIBRARIES = libecontactprint.la @@ -22,7 +23,8 @@ libecontactprint_la_SOURCES = \ libecontactprint_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(GNOME_PLATFORM_LIBS) noinst_PROGRAMS = contact-print-test @@ -33,6 +35,7 @@ contact_print_test_CPPFLAGS = \ -I$(top_srcdir) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) contact_print_test_SOURCES = test-print.c @@ -42,7 +45,8 @@ contact_print_test_LDADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ $(ecps_DATA) diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index f777f3c940..6338e221fe 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -11,7 +11,8 @@ libeabutil_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/widgets \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) libeabutil_la_SOURCES = \ addressbook.c \ @@ -22,10 +23,11 @@ libeabutil_la_SOURCES = \ libeabutil_la_LDFLAGS = $(NO_UNDEFINED) libeabutil_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la + $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) |