diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-06 23:35:20 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 23:35:20 +0800 |
| commit | 13dd7b235041c511c1ee7a42b66e5247ba2da8f9 (patch) | |
| tree | a6fc011df02b02e337a5ca575fd9e2457c999a61 /my-evolution/Makefile.am | |
| parent | 4b3ff4825bb86eb801aaa8bc641f754896f152b6 (diff) | |
| download | gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.tar gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.tar.gz gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.tar.bz2 gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.tar.lz gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.tar.xz gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.tar.zst gsoc2013-evolution-13dd7b235041c511c1ee7a42b66e5247ba2da8f9.zip | |
clean up, update, etc
* Makefile.am: clean up, update, etc
* component-factory.c: #include string.h
* e-summary.c (e_pixmap_file): s/IMAGEDIR/IMAGESDIR/
* e-summary-rdf.c: Fix some warnings
svn path=/trunk/; revision=19802
Diffstat (limited to 'my-evolution/Makefile.am')
| -rw-r--r-- | my-evolution/Makefile.am | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 470136da08..d6c8ae7549 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -1,23 +1,18 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_builddir)/shell \ - -I$(top_srcdir)/calendar \ - -I$(top_builddir)/calendar/cal-client \ - -I$(top_srcdir)/libical/src/libical \ - -I$(top_builddir)/libical/src/libical \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_IMAGEDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images"\" \ - -DEVOLUTION_BUTTONSDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images/buttons"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ - -DLOCATIONDIR=\""$(Locationdir)"\" \ - -DPREFIX=\"$(prefix)\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(datadir)"\" \ - -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -I$(top_srcdir)/calendar \ + -I$(top_builddir)/calendar/cal-client \ + -I$(top_srcdir)/libical/src/libical \ + -I$(top_builddir)/libical/src/libical \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagedir)"\" \ + -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DLOCATIONDIR=\""$(Locationdir)"\" \ + -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ $(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS) IDLS = \ @@ -83,14 +78,13 @@ libevolution_executive_summary_la_SOURCES = $(summary_sources) libevolution_executive_summary_la_LIBADD = $(summary_libs) libevolution_executive_summary_la_LDFLAGS = -module -avoid-version -Locationdir = $(datadir)/evolution-$(BASE_VERSION) +Locationdir = $(privdatadir) Location_DATA = Locations # .server files server_in_files = GNOME_Evolution_Summary.server.in.in -serverdir = $(libdir)/bonobo/servers server_DATA = $(server_in_files:.server.in.in=.server) $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ @@ -100,7 +94,6 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) # Glade -gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = my-evolution.glade # GConf schemas |