diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-03 05:34:53 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-03 05:34:53 +0800 |
| commit | c13881a0251b12e7c0d9bfc02a30d3d2b413725c (patch) | |
| tree | abc13b4b5ed11544526f4c1242528a4d0d196c6f /data/Makefile.am | |
| parent | 6dabfeeef03a5890d0ebffab4382ade94f6b7c32 (diff) | |
| download | gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.gz gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.bz2 gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.lz gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.xz gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.tar.zst gsoc2013-epiphany-c13881a0251b12e7c0d9bfc02a30d3d2b413725c.zip | |
R data/GNOME_Epiphany_Automation.server.in: A data/epiphany-service.xml: A
2006-01-02 Christian Persch <chpe@cvs.gnome.org>
* Makefile.am:
* autogen.sh:
* configure.ac:
R data/GNOME_Epiphany_Automation.server.in:
* data/Makefile.am:
A data/epiphany-service.xml:
A data/org.gnome.Epiphany.service.in:
* doc/reference/Makefile.am:
R idl/.cvsignore:
R idl/EphyAutomation.idl:
R idl/Makefile.am:
* lib/Makefile.am:
R lib/ephy-dbus.c:
R lib/ephy-dbus.h:
* lib/ephy-file-helpers.c: (ephy_file_launch_application):
* src/Makefile.am:
A src/ephy-activation.c:
A src/ephy-activation.h:
A src/ephy-dbus.c:
A src/ephy-dbus.h:
* src/ephy-main.c: (main):
* src/ephy-shell.c: (ephy_shell_init), (open_urls),
(dbus_g_proxy_finalized_cb), (ephy_shell_startup),
(ephy_shell_dispose):
Bonobo is dead; long live the Bonobos!
Patch by Gustavo Gama, bug #322463.
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 2dfdd64ab..a5c2bcba9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -25,10 +25,6 @@ default-prefs.js: $(default_prefs_files) default_prefsdir = $(pkgdatadir) default_prefs_DATA = default-prefs.js -server_in_files = GNOME_Epiphany_Automation.server.in -server_DATA = GNOME_Epiphany_Automation.server -serverdir = $(libdir)/bonobo/servers - desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) @@ -58,6 +54,16 @@ xsl_DATA = \ epiphany-bookmarks-html.xsl \ ephy-xml2ini.xsl +# Dbus service file +servicedir = $(datadir)/dbus-1/services +service_in_files = org.gnome.Epiphany.service.in +service_DATA = $(service_in_files:.service.in=.service) + +# Rule to make the service file with bindir expanded +$(service_DATA): $(service_in_files) Makefile + @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ + + install-data-local: $(schema_DATA) if GCONF_SCHEMAS_INSTALL if test -z "$(DESTDIR)" ; then \ @@ -78,6 +84,7 @@ EXTRA_DIST = \ $(pkgconfig_DATA) \ $(default_prefs_in_FILES) \ $(xsl_DATA) \ + $(service_DATA) \ $(m4data_DATA) \ check-mime.py \ generate-font-schemas.py |