diff options
Diffstat (limited to 'e-util/Makefile.am')
| -rw-r--r-- | e-util/Makefile.am | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 59ebc99b14..cd650b99b7 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -1,18 +1,16 @@ SUBDIRS = . ename -imagesdir = $(datadir)/evolution-$(BASE_VERSION)/images +imagesdir = $(datadir)/images/evolution -eutilincludedir = $(includedir)/evolution-$(BASE_VERSION)/e-util -econdincludedir = $(includedir)/evolution-$(BASE_VERSION)/e-conduit -edb3includedir = $(includedir)/evolution-$(BASE_VERSION)/e-db3util +eutilincludedir = $(includedir)/evolution/e-util +econdincludedir = $(includedir)/evolution/e-conduit +edb3includedir = $(includedir)/evolution/e-db3util INCLUDES = \ -I$(top_srcdir) \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ -DG_LOG_DOMAIN=\"e-utils\" \ - -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ $(DB3_CFLAGS) \ $(PISOCK_CFLAGS) \ $(E_UTIL_CFLAGS) @@ -21,10 +19,9 @@ privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la noinst_LTLIBRARIES = libeutil-static.la libeconduit-static.la eutilinclude_HEADERS = \ - e-account-list.h \ - e-account.h \ - e-categories-config.h \ + e-bonobo-factory-util.h \ e-categories-master-list-wombat.h \ + e-categories-config.h \ e-component-listener.h \ e-config-listener.h \ e-corba-utils.h \ @@ -47,17 +44,14 @@ eutilinclude_HEADERS = \ e-request.h \ e-sexp.h \ e-time-utils.h \ - e-trie.h \ e-url.h \ - e-xml-hash-utils.h \ md5-utils.h libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ - e-account-list.c \ - e-account.c \ - e-categories-config.c \ + e-bonobo-factory-util.c \ e-categories-master-list-wombat.c \ + e-categories-config.c \ e-component-listener.c \ e-config-listener.c \ e-corba-utils.c \ @@ -80,31 +74,9 @@ libeutil_la_SOURCES = \ e-request.c \ e-sexp.c \ e-time-utils.c \ - e-trie.c \ e-url.c \ - e-util-marshal.c \ - e-xml-hash-utils.c \ md5-utils.c -# GLib marshalling cruft - -e-util-marshal.h: e-util-marshal.list - ( @GLIB_GENMARSHAL@ --prefix=e_util_marshal e-util-marshal.list --header > e-util-marshal.tmp \ - && mv e-util-marshal.tmp e-util-marshal.h ) \ - || ( rm -f e-util-marshal.tmp && exit 1 ) - -e-util-marshal.c: e-util-marshal.h - ( @GLIB_GENMARSHAL@ --prefix=e_util_marshal e-util-marshal.list --body > e-util-marshal.tmp \ - && mv e-util-marshal.tmp e-util-marshal.c ) \ - || ( rm -f e-util-marshal.tmp && exit 1 ) - -MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h - - -# FIXME TODO -# e-passwords.c -# bonobo-factory-util.[ch] - libeutil_la_LIBADD = $(E_UTIL_LIBS) libeutil_static_la_SOURCES = $(libeutil_la_SOURCES) @@ -125,7 +97,7 @@ pilot_sources = \ if ENABLE_PILOT_CONDUITS pilot_compile = $(pilot_sources) else -pilot_compile = +pilot_compile = e-pilot-settings.c e-pilot-settings.h endif libeconduit_la_SOURCES = $(pilot_compile) @@ -133,7 +105,7 @@ libeconduit_la_SOURCES = $(pilot_compile) libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES) libeconduit_static_la_LDFLAGS = -all-static -EXTRA_DIST = $(pilot_sources) e-util-marshal.list +EXTRA_DIST = $(pilot_sources) edb3include_HEADERS = \ e-db3-utils.h \ @@ -143,6 +115,3 @@ libedb3util_la_SOURCES = \ $(edb3include_HEADERS) \ e-db3-utils.c \ e-dbhash.c - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) |