diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-31 23:32:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-31 23:38:57 +0800 |
| commit | 5fca82f0b00fbecf8e7045ea5ba99016e03605fb (patch) | |
| tree | 0b2d09f07cd573d4e875dc4e3e0ab23961699142 | |
| parent | 5d9609032b277e78ddc6aa4e16c4dbc1fe860eca (diff) | |
| download | gsoc2013-evolution-5fca82f0b00fbecf8e7045ea5ba99016e03605fb.tar.gz gsoc2013-evolution-5fca82f0b00fbecf8e7045ea5ba99016e03605fb.tar.zst gsoc2013-evolution-5fca82f0b00fbecf8e7045ea5ba99016e03605fb.zip | |
Fix build settings under capplet.
| -rw-r--r-- | capplet/Makefile.am | 17 | ||||
| -rw-r--r-- | capplet/settings/Makefile.am | 14 |
2 files changed, 10 insertions, 21 deletions
diff --git a/capplet/Makefile.am b/capplet/Makefile.am index aac8cf7a98..b84e28425e 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -1,6 +1,9 @@ SUBDIRS = settings -AM_CPPFLAGS = \ +bin_PROGRAMS = evolution-settings + +evolution_settings_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ @@ -30,22 +33,12 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mail\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -AM_CFLAGS =\ - -Wall\ - -g -O0 - -bin_PROGRAMS = evolution-settings - evolution_settings_SOURCES = \ anjal-settings-main.c -evolution_settings_LDFLAGS = \ - -Wl,--export-dynamic - if OS_WIN32 -evolution_settings_LDFLAGS += -mwindows +evolution_settings_LDFLAGS = -mwindows endif evolution_settings_LDADD = \ diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index 699ac2e86e..61b74c888b 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -1,6 +1,9 @@ SUBDIRS = mail-autoconfig -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libevolution-mail-settings.la + +libevolution_mail_settings_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ @@ -17,6 +20,7 @@ AM_CPPFLAGS = \ $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ + -DANJAL_SETTINGS \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ @@ -32,12 +36,6 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" -AM_CFLAGS =\ - -Wall\ - -g -O0 - -privsolib_LTLIBRARIES = libevolution-mail-settings.la - libevolution_mail_settings_la_SOURCES = \ mail-settings-view.c \ mail-settings-view.h \ @@ -54,8 +52,6 @@ libevolution_mail_settings_la_SOURCES = \ mail-guess-servers.c \ mail-guess-servers.h -libevolution_mail_settings_la_CFLAGS = -DANJAL_SETTINGS - libevolution_mail_settings_la_LIBADD = \ $(EVOLUTION_MAIL_LIBS) \ $(CERT_UI_LIBS) \ |