diff options
| author | Xan Lopez <xan@igalia.com> | 2011-12-15 01:01:14 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2011-12-15 01:01:14 +0800 |
| commit | 3295288a7292a74d14c6a5a20e41e2afe010f34e (patch) | |
| tree | b508743f41c1fe93f8997b295d1fa21df2ab3118 /src/Makefile.am | |
| parent | 2db47fb32732e9613e5338d8c165ed5f771e819a (diff) | |
| download | gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.tar gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.tar.gz gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.tar.bz2 gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.tar.lz gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.tar.xz gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.tar.zst gsoc2013-epiphany-3295288a7292a74d14c6a5a20e41e2afe010f34e.zip | |
Remove last traces of the EggToolbar code
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 84b707883..45b55d210 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,6 @@ NOINST_H_FILES = \ ephy-navigation-history-action.h \ ephy-navigation-up-action.h \ ephy-password-info.h \ - ephy-toolbars-model.h \ languages.h \ pdm-dialog.h \ popup-commands.h \ @@ -71,7 +70,6 @@ libephymain_la_SOURCES = \ ephy-password-info.c \ ephy-session.c \ ephy-shell.c \ - ephy-toolbars-model.c \ ephy-window.c \ pdm-dialog.c \ popup-commands.c \ @@ -274,26 +272,7 @@ EPHY_GIR_C_FILES = \ $(top_srcdir)/src/ephy-window.c \ $(NULL) -EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) - $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ - $(INTROSPECTION_SCANNER) -v --warn-all \ - --identifier-prefix=Egg \ - --symbol-prefix=egg \ - --namespace=EphyEgg \ - --nsversion=$(EPIPHANY_API_VERSION) \ - --include=Gtk-3.0 \ - --include=libxml2-2.0 \ - --library=$(top_builddir)/lib/egg/libegg.la \ - --pkg=gtk+-3.0 \ - --pkg=libxml-2.0 \ - --output=$@ \ - $(top_srcdir)/lib/egg/egg-editable-toolbar.h \ - $(top_srcdir)/lib/egg/egg-toolbars-model.h \ - $(top_srcdir)/lib/egg/egg-editable-toolbar.c \ - $(top_srcdir)/lib/egg/egg-toolbars-model.c \ - $(top_builddir)/lib/egg/libegg.la - -Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \ +Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \ $(EPHY_GIR_C_FILES) epiphany $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ $(INTROSPECTION_SCANNER) -v --warn-all \ @@ -306,7 +285,6 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTR --include=Gtk-3.0 \ --include=libxml2-2.0 \ --include=WebKit-3.0 \ - --include-uninstalled=EphyEgg-$(EPIPHANY_API_VERSION).gir \ --program=./epiphany \ --output=$@ \ --pkg=epiphany-$(EPIPHANY_API_VERSION) \ @@ -320,17 +298,14 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTR $(EPHY_GIR_C_FILES) girdir = $(datadir)/gir-1.0 -gir_DATA = Epiphany-$(EPIPHANY_API_VERSION).gir EphyEgg-$(EPIPHANY_API_VERSION).gir +gir_DATA = Epiphany-$(EPIPHANY_API_VERSION).gir typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = Epiphany-$(EPIPHANY_API_VERSION).typelib EphyEgg-$(EPIPHANY_API_VERSION).typelib +typelibs_DATA = Epiphany-$(EPIPHANY_API_VERSION).typelib Epiphany-$(EPIPHANY_API_VERSION).typelib: Epiphany-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_COMPILER) $(AM_V_GEN) $(INTROSPECTION_COMPILER) Epiphany-$(EPIPHANY_API_VERSION).gir --includedir=$(top_builddir)/src --includedir=$(srcdir) -o Epiphany-$(EPIPHANY_API_VERSION).typelib -EphyEgg-$(EPIPHANY_API_VERSION).typelib: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_COMPILER) - $(AM_V_GEN) $(INTROSPECTION_COMPILER) EphyEgg-$(EPIPHANY_API_VERSION).gir -o EphyEgg-$(EPIPHANY_API_VERSION).typelib - CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # HAVE_INTROSPECTION |