diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-06-15 15:04:08 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-06-15 15:04:08 +0800 |
| commit | 94daae3dba8e86e88f69320bc82795fe660ec9cd (patch) | |
| tree | 9965d4f6dfc6d48adecd0b9084442185d73d58c7 /shell/Makefile.am | |
| parent | 08dedf0a8a520b55c51a8117dc015915ec39f7fe (diff) | |
| download | gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.gz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.bz2 gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.lz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.xz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.zst gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.zip | |
Remove the last remaining usage of GConf
Diffstat (limited to 'shell/Makefile.am')
| -rw-r--r-- | shell/Makefile.am | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 9259d63db9..9edfe88cd6 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -62,7 +62,6 @@ libeshell_la_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(EGG_SMCLIENT_CFLAGS) \ $(GTKHTML_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ $(CLUTTER_CFLAGS) libeshell_la_SOURCES = \ @@ -101,7 +100,6 @@ libeshell_la_LIBADD = \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(EGG_SMCLIENT_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(CLUTTER_LIBS) # Evolution executable @@ -185,43 +183,10 @@ error_DATA = shell.error errordir = $(privdatadir)/errors @EVO_PLUGIN_RULE@ -# GConf schemas - -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps_evolution_shell.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL - -if OS_WIN32 -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ - echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ - cmd /c _temp.bat; \ - rm _temp.bat; \ - done \ - fi -else -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ - fi -endif - -endif - # Extra dist stuff EXTRA_DIST = \ shell.error.xml \ - $(schema_in_files) \ evolution-nognome.in \ evolution-icon.rc \ evolution.ico \ @@ -246,8 +211,6 @@ endif BUILT_SOURCES = $(error_DATA) $(ENUM_GENERATED) CLEANFILES = $(BUILT_SOURCES) -DISTCLEANFILES = $(schema_DATA) - dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) |