diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/Makefile.am | 28 | ||||
| -rw-r--r-- | shell/importer/Makefile.am | 48 |
3 files changed, 41 insertions, 40 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 87f1931eb6..966a2ff1a3 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2002-01-27 Ettore Perazzoli <ettore@ximian.com> + + * Makefile.am: Use SHELL_CFLAGS and SHELL_LIBS. + * importer/Makefile.am: Likewise. + 2002-01-24 Ettore Perazzoli <ettore@ximian.com> * Makefile.am: Just use BONOBO_HTML_GNOME_CFLAGS and diff --git a/shell/Makefile.am b/shell/Makefile.am index 0658e4a4df..84cf6e59ec 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,17 +1,17 @@ SUBDIRS = glade importer -INCLUDES = -O \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_srcdir)/libical/src/libical \ - -I$(top_srcdir) \ - $(BONOBO_HTML_GNOME_CFLAGS) \ - -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DG_LOG_DOMAIN=\"evolution-shell\" +INCLUDES = -O \ + -I$(top_srcdir)/widgets \ + -I$(top_srcdir)/widgets/misc \ + -I$(top_srcdir)/libical/src/libical \ + -I$(top_srcdir) \ + -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DG_LOG_DOMAIN=\"evolution-shell\" \ + $(SHELL_CFLAGS) # CORBA stuff @@ -179,7 +179,7 @@ evolution_LDADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(BONOBO_HTML_GNOME_LIBS) + $(SHELL_LIBS) # Test component @@ -191,7 +191,7 @@ evolution_test_component_SOURCES = \ evolution_test_component_LDADD = \ libeshell.la \ - $(BONOBO_HTML_GNOME_LIBS) + $(SHELL_LIBS) install-test-component: evolution-test-component $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index c50bc0262b..6e08187e34 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -1,17 +1,15 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_builddir)/shell \ - -I$(includedir) \ - $(EXTRA_GNOME_CFLAGS) \ - $(BONOBO_GNOME_CFLAGS) \ - -DG_LOG_DOMAIN=\"Evolution-Importer\" \ - -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -I$(includedir) \ + -DG_LOG_DOMAIN=\"Evolution-Importer\" \ + -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ + $(SHELL_CFLAGS) lib_LTLIBRARIES = libevolution-importer.la -IDLS = \ - GNOME_Evolution_Importer.idl +IDLS = GNOME_Evolution_Importer.idl IDL_GENERATED = \ GNOME_Evolution_Importer.h \ @@ -29,27 +27,25 @@ idldir = $(datadir)/idl idl_DATA = $(IDLS) libevolution_importerincludedir = $(includedir)/evolution/importer -libevolution_importer_la_SOURCES = \ - $(IDL_GENERATED) \ +libevolution_importer_la_SOURCES = \ + $(IDL_GENERATED) \ evolution-intelligent-importer.c \ - evolution-importer-client.c \ - evolution-importer-listener.c \ - evolution-importer.c \ - intelligent.c \ + evolution-importer-client.c \ + evolution-importer-listener.c \ + evolution-importer.c \ + intelligent.c \ intelligent.h -libevolution_importerinclude_HEADERS = \ - GNOME_Evolution_Importer.h \ +libevolution_importerinclude_HEADERS = \ + GNOME_Evolution_Importer.h \ evolution-intelligent-importer.h \ - evolution-importer-client.h \ - evolution-importer-listener.h \ + evolution-importer-client.h \ + evolution-importer-listener.h \ evolution-importer.h -libevolution_importer_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(BONOBO_CONF_LIBS) \ - $(EXTRA_GNOME_LIBS) \ - $(GTKHTML_LIBS) +libevolution_importer_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(SHELL_LIBS) gladedir = $(datadir)/evolution/glade glade_DATA = import.glade |