diff options
Diffstat (limited to 'e-util/Makefile.am')
| -rw-r--r-- | e-util/Makefile.am | 61 |
1 files changed, 7 insertions, 54 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 6e8656bb96..e6182ce2b7 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -1,32 +1,15 @@ eutilincludedir = $(privincludedir)/e-util econdincludedir = $(privincludedir)/e-conduit -if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la -PLATFORM_SOURCES = e-win32-reloc.c -endif - INCLUDES = \ -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/widgets \ - -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ - -DSEARCH_RULE_DIR=\"$(ruledir)\" \ -DG_LOG_DOMAIN=\"e-utils\" \ $(GNOME_PILOT_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_FULL_CFLAGS) \ - $(ICONV_CFLAGS) \ $(E_UTIL_CFLAGS) privlib_LTLIBRARIES = libeutil.la libeconduit.la @@ -36,11 +19,11 @@ eutilinclude_HEADERS = \ e-account.h \ e-bconf-map.h \ e-categories-config.h \ + e-categories-master-list-wombat.h \ e-component-listener.h \ e-config.h \ e-config-listener.h \ e-corba-utils.h \ - e-cursor.h \ e-dialog-utils.h \ e-dialog-widgets.h \ e-error.h \ @@ -66,30 +49,20 @@ eutilinclude_HEADERS = \ e-signature-list.h \ e-time-utils.h \ e-uid.h \ - md5-utils.h \ - e-bit-array.h \ - e-iconv.h \ - e-sorter.h \ - e-sorter-array.h \ - e-text-event-processor-emacs-like.h \ - e-text-event-processor-types.h \ - e-text-event-processor.h \ - e-util.h \ - e-util-marshal.h \ - e-xml-utils.h + md5-utils.h libeutil_la_SOURCES = \ + $(MARSHAL_GENERATED) \ $(eutilinclude_HEADERS) \ - e-util-marshal.c \ e-account-list.c \ e-account.c \ e-bconf-map.c \ e-categories-config.c \ + e-categories-master-list-wombat.c \ e-component-listener.c \ e-config.c \ e-config-listener.c \ e-corba-utils.c \ - e-cursor.c \ e-dialog-utils.c \ e-dialog-widgets.c \ e-error.c \ @@ -117,28 +90,12 @@ libeutil_la_SOURCES = \ e-uid.c \ eggtrayicon.c \ eggtrayicon.h \ - md5-utils.c \ - e-bit-array.c \ - e-i18n.h \ - e-iconv.c \ - e-sorter.c \ - e-sorter-array.c \ - e-text-event-processor-emacs-like.c \ - e-text-event-processor.c \ - e-util.c \ - e-util-private.h \ - e-xml-utils.c \ - $(PLATFORM_SOURCES) + md5-utils.c MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h @EVO_MARSHAL_RULE@ -libeutil_la_LDFLAGS = $(NO_UNDEFINED) - -libeutil_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(ICONV_LIBS) \ - $(E_UTIL_LIBS) +libeutil_la_LIBADD = $(E_UTIL_LIBS) econdinclude_HEADERS = \ e-pilot-map.h \ @@ -157,10 +114,6 @@ endif libeconduit_la_SOURCES = $(pilot_compile) -libeconduit_la_LDFLAGS = $(NO_UNDEFINED) - -libeconduit_la_LIBADD = $(E_UTIL_LIBS) - error_DATA = e-system.error errordir = $(privdatadir)/errors @EVO_PLUGIN_RULE@ |