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 /importers | |
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 'importers')
-rw-r--r-- | importers/ChangeLog | 4 | ||||
-rw-r--r-- | importers/Makefile.am | 30 |
2 files changed, 14 insertions, 20 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog index e5e6900b40..bdb883850f 100644 --- a/importers/ChangeLog +++ b/importers/ChangeLog @@ -1,3 +1,7 @@ +2002-01-27 Ettore Perazzoli <ettore@ximian.com> + + * Makefile.am: Use IMPORTERS_CFLAGS and IMPORTERS_LIBS. + 2001-11-09 Iain Holmes <iain@ximian.com> * netscape-importer.c (netscape_create_structure): Don't open the diff --git a/importers/Makefile.am b/importers/Makefile.am index 4c22c5e20b..d9061dd9bb 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -3,16 +3,14 @@ bin_PROGRAMS = evolution-netscape-importer \ evolution-pine-importer \ evolution-gnomecard-importer -INCLUDES = \ +INCLUDES = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DG_LOG_DOMAIN=\"Evolution-Importer\" \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ - -I$(top_srcdir)/shell \ + -DG_LOG_DOMAIN=\"Evolution-Importer\" \ + -I$(top_srcdir) \ + -I$(top_builddir)/shell \ + -I$(top_srcdir)/shell \ -I$(top_srcdir)/addressbook/backend/ebook \ - $(BONOBO_GNOME_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) + $(IMPORTERS_CFLAGS) IDLS = \ $(top_srcdir)/mail/Mail.idl @@ -33,9 +31,7 @@ evolution_netscape_importer_SOURCES = \ evolution_netscape_importer_LDADD = \ $(top_builddir)/shell/importer/libevolution-importer.la \ $(top_builddir)/e-util/libeutil.la \ - $(BONOBO_CONF_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) + $(IMPORTERS_LIBS) evolution_elm_importer_SOURCES = \ elm-importer.c @@ -43,9 +39,7 @@ evolution_elm_importer_SOURCES = \ evolution_elm_importer_LDADD = \ $(top_builddir)/shell/importer/libevolution-importer.la \ $(top_builddir)/e-util/libeutil.la \ - $(BONOBO_CONF_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) + $(IMPORTERS_LIBS) evolution_pine_importer_SOURCES = \ pine-importer.c @@ -58,9 +52,7 @@ evolution_pine_importer_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/e-util/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ - $(BONOBO_CONF_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) + $(IMPORTERS_LIBS) evolution_gnomecard_importer_SOURCES = \ evolution-gnomecard-importer.c @@ -73,9 +65,7 @@ evolution_gnomecard_importer_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/e-util/ename/libename.la \ $(top_builddir)/libversit/libversit.la \ - $(BONOBO_CONF_LIBS) \ - $(BONOBO_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) + $(IMPORTERS_LIBS) oafdir = $(datadir)/oaf oaf_in_files = GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in \ |