diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-19 11:08:30 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-19 11:08:30 -0500 |
| commit | 2fe4c360b2eb616cb43472b8e8e7b69bdefd349d (patch) | |
| tree | 2e5107ec634bf68492580e1ed6f1719a1f073e74 | |
| parent | 1290c1032eea7ce2f8bdd28e3bebf618b47216ca (diff) | |
| download | ayatana-indicator-session-2fe4c360b2eb616cb43472b8e8e7b69bdefd349d.tar.gz ayatana-indicator-session-2fe4c360b2eb616cb43472b8e8e7b69bdefd349d.tar.bz2 ayatana-indicator-session-2fe4c360b2eb616cb43472b8e8e7b69bdefd349d.zip | |
Dropping gconf from build
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | data/Makefile.am | 24 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 1 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 19cc4bc..7fa9db6 100644 --- a/configure.ac +++ b/configure.ac @@ -89,16 +89,6 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(GTKLOGOUTHELPER_CFLAGS) AC_SUBST(GTKLOGOUTHELPER_LIBS) -AC_PATH_PROG(GCONFTOOL, gconftool-2) -dnl Specify the gconf configuration source, -dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults - -AM_GCONF_SOURCE_2 - -PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0) -AC_SUBST(GCONF_CFLAGS) -AC_SUBST(GCONF_LIBS) - ########################### # Check to see if we're local ########################### diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..2a9ea62 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,25 +9,8 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -############################## -# GConf Schema -############################## - -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-session.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - @INTLTOOL_SCHEMAS_RULE@ - -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - EXTRA_DIST = \ $(service_in_files) \ $(schema_in_files) @@ -36,10 +19,3 @@ CLEANFILES = \ $(dbus_services_DATA) \ $(schema_DATA) -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif diff --git a/src/Makefile.am b/src/Makefile.am index 3bfd790..9565545 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,7 +100,7 @@ indicator_session_service_SOURCES = \ users-service-dbus.h \ users-service-dbus.c \ user-menu-mgr.h \ - user-menu-mgr.c \ + user-menu-mgr.c \ device-menu-mgr.h \ device-menu-mgr.c \ apt-watcher.h \ |