diff options
| author | Claudio Saavedra <csaavedra@igalia.com> | 2011-06-25 03:04:04 +0800 |
|---|---|---|
| committer | Claudio Saavedra <csaavedra@igalia.com> | 2011-06-27 21:29:46 +0800 |
| commit | d40bac577b628a3db8ef90f8a862b80e8cb729c2 (patch) | |
| tree | a5c838f14966c1ba463667953a47035b86237774 /src/Makefile.am | |
| parent | 795fe5c4213809c8d776843fab6dcc31848e8871 (diff) | |
| download | gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.tar gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.tar.gz gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.tar.bz2 gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.tar.lz gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.tar.xz gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.tar.zst gsoc2013-epiphany-d40bac577b628a3db8ef90f8a862b80e8cb729c2.zip | |
Drop all dbus-glib code
We still need to provide equivalent ways to activate epiphany, but we
will use GActions instead.
https://bugzilla.gnome.org/show_bug.cgi?id=622903
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a97aa27e7..4694c5f88 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,6 @@ header_DATA = \ NOINST_H_FILES = \ ephy-action-helper.h \ - ephy-activation.h \ ephy-application.h \ ephy-encoding-dialog.h \ ephy-encoding-menu.h \ @@ -42,7 +41,6 @@ NOINST_H_FILES = \ window-commands.h INST_H_FILES = \ - ephy-dbus.h \ ephy-extension.h \ ephy-extensions-manager.h \ ephy-link.h \ @@ -54,13 +52,10 @@ INST_H_FILES = \ $(NULL) libephymain_la_SOURCES = \ - ephy-activation.c \ ephy-action-helper.c \ ephy-application.c \ ephy-completion-model.c \ ephy-completion-model.h \ - ephy-dbus.c \ - ephy-dbus.h \ ephy-encoding-dialog.c \ ephy-encoding-menu.c \ ephy-extension.c \ @@ -114,15 +109,12 @@ libephymain_la_CPPFLAGS = \ libephymain_la_CFLAGS = \ $(DEPENDENCIES_CFLAGS) \ - $(DBUS_CFLAGS) \ $(WEBKIT_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ $(AM_CFLAGS) BUILT_SOURCES = \ - $(TYPES_SOURCE) \ - ephy-dbus-client-bindings.h \ - ephy-dbus-server-bindings.h + $(TYPES_SOURCE) nodist_libephymain_la_SOURCES += \ ephy-network-manager.c \ @@ -168,8 +160,7 @@ epiphany_CPPFLAGS = \ epiphany_CFLAGS = \ $(DEPENDENCIES_CFLAGS) \ - $(GECKO_CFLAGS) \ - $(DBUS_CFLAGS) \ + $(GECKO_CFLAGS) \ $(AM_CFLAGS) epiphany_LDFLAGS = -dlopen self @@ -182,7 +173,6 @@ epiphany_LDADD = \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(DBUS_LIBS) \ $(NETWORK_MANAGER_LIBS) \ $(LIBINTL) @@ -201,9 +191,7 @@ TYPES_SOURCE = \ stamp_files = \ stamp-ephy-type-builtins.c \ - stamp-ephy-type-builtins.h \ - stamp-ephy-dbus-server-bindings.h \ - stamp-ephy-dbus-client-bindings.h + stamp-ephy-type-builtins.h ephy-type-builtins.c: stamp-ephy-type-builtins.c Makefile @true @@ -247,22 +235,6 @@ stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES) && rm -f xgen-$(@F) \ && echo timestamp > $(@F) -ephy-dbus-server-bindings.h: stamp-ephy-dbus-server-bindings.h - @true -stamp-ephy-dbus-server-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-server $< > xgen-$(@F) \ - && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ - && rm -f xgen-$(@F) \ - && echo timestamp > $(@F) - -ephy-dbus-client-bindings.h: stamp-ephy-dbus-client-bindings.h - @true -stamp-ephy-dbus-client-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-client $< > xgen-$(@F) \ - && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ - && rm -f xgen-$(@F) \ - && echo timestamp > $(@F) - CLEANFILES = $(stamp_files) $(BUILT_SOURCES) DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) |