diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-06 06:25:18 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 06:25:18 +0800 |
| commit | fefb7820db99e63564395beeec82949ccb0e3b9f (patch) | |
| tree | 2d33e3a41b20dfa424a0a7a1bb4a1a02ca6889db /shell/importer | |
| parent | fe4da718f0ae5a8a0fbf7249acf3f235113df792 (diff) | |
| download | gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.tar gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.tar.gz gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.tar.bz2 gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.tar.lz gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.tar.xz gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.tar.zst gsoc2013-evolution-fefb7820db99e63564395beeec82949ccb0e3b9f.zip | |
Define EVOLUTION_IMAGES using $(imagesdir). Define EVOLUTION_GLADEDIR
* Makefile.am (INCLUDES): Define EVOLUTION_IMAGES using
$(imagesdir). Define EVOLUTION_GLADEDIR using $(gladedir)
(eshellincludedir): Define in terms of $(privincludedir)
(evolution_LDFLAGS): Remove this. gmodule-2's LDFLAGS include the
equivalent of -export-dynamic for us.
(serverdir, etspecdir): Remove. Defined in configure.in now.
* e-folder.c: #include <string.h>
* e-corba-config-page.c: Likewise
* e-shell-config.c: Likewise
* e-shell-folder-creation-dialog.c: Likewise
* e-shell-folder-title-bar.c: Likewise
* e-shell-startup-wizard.c: Likewise
* evolution-activity-client.c: Likewise.
* evolution-shell-component-client.c: Likewise
* evolution-shell-component-utils.c: Likewise
* evolution-storage.c: Likewise
* evolution-test-component.c: Likewise
* e-shortcuts-view.c (destroy_group_cb): Remove unused variable
* importer/Makefile.am (INCLUDES): Remove -I$(includedir). Define
EVOLUTION_GLADEDIR using $(gladedir).
(libevolution_importerincludedir): Define in terms of
$(privincludedir)
(gladedir): Removed. Defined in configure.in now.
* glade/Makefile.am (gladedir): Likewise
svn path=/trunk/; revision=19774
Diffstat (limited to 'shell/importer')
| -rw-r--r-- | shell/importer/Makefile.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index 94f532db3c..103dfb8312 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -1,10 +1,9 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_builddir)/shell \ - -I$(includedir) \ - -DG_LOG_DOMAIN=\"Evolution-Importer\" \ - -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution-$(BASE_VERSION)/glade\" \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -DG_LOG_DOMAIN=\"Evolution-Importer\" \ + -DEVOLUTION_GLADEDIR="\"$(gladedir)\"" \ $(SHELL_CFLAGS) privlib_LTLIBRARIES = libevolution-importer.la @@ -37,7 +36,7 @@ idl_DATA = $(IDLS) # Component -libevolution_importerincludedir = $(includedir)/evolution-$(BASE_VERSION)/importer +libevolution_importerincludedir = $(privincludedir)/importer libevolution_importer_la_SOURCES = \ $(IDL_GENERATED) \ evolution-intelligent-importer.c \ @@ -58,7 +57,6 @@ libevolution_importer_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(SHELL_LIBS) -gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = import.glade EXTRA_DIST = $(glade_DATA) $(IDLS) |