diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-28 01:21:36 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-28 01:21:36 +0800 |
| commit | 79a377ddf20574b03d02f93fc85f542455b12744 (patch) | |
| tree | f236578097b3c734c75ddc546b6d76a36a6a380c /addressbook | |
| parent | 9370911a01d8de412d27bc9ca126a2dee4d60f02 (diff) | |
| download | gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.gz gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.bz2 gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.lz gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.xz gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.zst gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.zip | |
Final cleanup for the CFLAGS and LIBS in the Makefiles.
svn path=/trunk/; revision=15486
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/Makefile.am | 6 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 25 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 5 | ||||
| -rw-r--r-- | addressbook/gui/merging/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/search/Makefile.am | 3 |
6 files changed, 16 insertions, 34 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index e1bcea47fc..992a69f6f0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2002-01-27 Ettore Perazzoli <ettore@ximian.com> + + * gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS. + * gui/contact-list-editor/Makefile.am: Likewise. + * gui/merging/Makefile.am: Likewise. + * gui/search/Makefile.am: Likewise. + * gui/component/select-names/Makefile.am: Likewise. + 2002-01-25 Jeffrey Stedfast <fejj@ximian.com> * backend/ebook/e-destination.c (e_destination_is_valid): Don't diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 6c3ed1674e..0f6789dd11 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -25,8 +25,6 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ - $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/shell \ @@ -38,11 +36,11 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/contact-editor \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ - $(BONOBO_HTML_GNOME_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" + -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) lib_LTLIBRARIES = libeselectnames.la diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 19598eeb7b..c6dd88415d 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,6 +1,4 @@ INCLUDES = \ - $(BONOBO_GNOME_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ @@ -11,7 +9,8 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ - -DG_LOG_DOMAIN=\"contact-editor\" + -DG_LOG_DOMAIN=\"contact-editor\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ libecontacteditor.a @@ -28,26 +27,6 @@ libecontacteditor_a_SOURCES = \ e-contact-quick-add.c \ e-contact-quick-add.h -# noinst_PROGRAMS = \ -# contact-editor-test - -# contact_editor_test_SOURCES = \ -# test-editor.c - -# contact_editor_test_LDADD = \ -# libecontacteditor.a \ -# $(top_builddir)/e-util/libeutil.la \ -# $(top_builddir)/addressbook/printing/libecontactprint.a \ -# $(top_builddir)/addressbook/backend/ebook/libebook.la \ -# $(top_builddir)/e-util/ename/libename.la \ -# $(top_builddir)/libversit/libversit.la \ -# $(GNOMEGNORBA_LIBS) \ -# $(BONOBO_GNOME_LIBS) \ -# $(top_builddir)/widgets/misc/libemiscwidgets.a \ -# $(top_builddir)/e-util/libeutil.la \ -# $(GNOME_PRINT_LIBS) \ -# $(EXTRA_GNOME_LIBS) - evolutiondir = $(datadir)/evolution evolution_DATA = arrow.png diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 1164f2c594..f710729826 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -1,6 +1,4 @@ INCLUDES = \ - $(BONOBO_GNOME_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ @@ -11,7 +9,8 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ - -DG_LOG_DOMAIN=\"contact-list-editor\" + -DG_LOG_DOMAIN=\"contact-list-editor\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ libecontactlisteditor.a diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index 5a00726f26..7df0ac4fcc 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -4,8 +4,7 @@ INCLUDES = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend/ebook \ - $(BONOBO_GNOME_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) + $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ libecardmerging.a diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am index d5f3602bbb..db4117c785 100644 --- a/addressbook/gui/search/Makefile.am +++ b/addressbook/gui/search/Makefile.am @@ -13,8 +13,7 @@ INCLUDES = \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ -DSEARCH_RULE_DIR=\"$(ruledir)\" \ - $(BONOBO_GNOME_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) + $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ libeaddressbooksearch.a |