diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-11-25 22:32:54 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-25 22:32:54 +0800 |
| commit | 6dc1dc5620c653d17d467d129c64dad94f8f82ac (patch) | |
| tree | 72e675a0ab0593c536e933e54ac90995b83150d0 /e-util/Makefile.am | |
| parent | c3b27aca696a51e4b6d455f6a0ec39e61bb434bc (diff) | |
| download | gsoc2013-evolution-6dc1dc5620c653d17d467d129c64dad94f8f82ac.tar.gz gsoc2013-evolution-6dc1dc5620c653d17d467d129c64dad94f8f82ac.tar.zst gsoc2013-evolution-6dc1dc5620c653d17d467d129c64dad94f8f82ac.zip | |
Sort the stuff in the Win32 part for clarity. Add some new run-time
2005-11-25 Tor Lillqvist <tml@novell.com>
* e-util-private.h: Sort the stuff in the Win32 part for
clarity. Add some new run-time overrides for compile-time
paths. Include fcntl.h and define O_BINARY as zero if not defined
(on Unix).
* e-win32-reloc.c: Sort here, too, and add the implementation for
the new run-time overrides.
* Makefile.am: Ditto here. Link with INTLLIBS.
svn path=/trunk/; revision=30670
Diffstat (limited to 'e-util/Makefile.am')
| -rw-r--r-- | e-util/Makefile.am | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 1527521627..caf4df42e4 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -1,5 +1,6 @@ eutilincludedir = $(privincludedir)/e-util econdincludedir = $(privincludedir)/e-conduit +ecpsdir = $(privdatadir)/ecps if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la @@ -10,23 +11,26 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \ + -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_LIBDIR=\""$(datadir)"\" \ + -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_LIBDIR=\""$(datadir)"\" \ + -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ + -DEVOLUTION_PREFIX=\""$(prefix)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DSEARCH_RULE_DIR=\"$(ruledir)\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ - -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ + -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \ + -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DSEARCH_RULE_DIR=\"$(ruledir)\" \ -DG_LOG_DOMAIN=\"e-utils\" \ $(GNOME_PILOT_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ @@ -143,7 +147,8 @@ libeutil_la_LDFLAGS = $(NO_UNDEFINED) libeutil_la_LIBADD = \ $(WIN32_BOOTSTRAP_LIBS) \ $(ICONV_LIBS) \ - $(E_UTIL_LIBS) + $(E_UTIL_LIBS) \ + $(INTLLIBS) econdinclude_HEADERS = \ e-pilot-map.h \ |