[dconf] split out dconf-editor, fix `make dist'. 0.1.
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [dconf] split out dconf-editor, fix `make dist'. 0.1.
- Date: Wed, 16 Sep 2009 16:57:05 +0000 (UTC)
commit 427b78fdf2eaa25b9576202308fef95436520835
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Sep 16 12:56:21 2009 -0400
split out dconf-editor, fix `make dist'. 0.1.
Makefile.am | 4 -
configure.ac | 22 +-----
editor/.gitignore | 5 -
editor/Makefile.am | 9 --
editor/editor.vala | 216 ----------------------------------------------------
gio/Makefile.am | 2 +-
6 files changed, 2 insertions(+), 256 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 59e5db8..bd31b12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,3 @@ SUBDIRS = common dconf bin writer config
if ENABLE_GIO
SUBDIRS += gio
endif
-
-if ENABLE_GTK
-SUBDIRS += editor
-endif
diff --git a/configure.ac b/configure.ac
index 36ee449..f378a42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,33 +1,14 @@
-AC_INIT(dconf, alpha)
+AC_INIT(dconf, 0.1)
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AM_SILENT_RULES
AC_PROG_LIBTOOL
-AM_PROG_VALAC
AC_PROG_CC
PKG_CHECK_MODULES(glib, glib-2.0)
PKG_CHECK_MODULES(dbus, dbus-1)
-AC_ARG_ENABLE(gtk,
- AS_HELP_STRING([--enable-gtk],
- [Enable GTK frontends (dconf-editor)]),
- [], [
- if ${PKG_CONFIG} --exists gtk+-2.0; then
- enable_gtk=yes
- else
- enable_gtk=no
- fi
- ])
-
-if test "$enable_gtk" = "yes"; then
- PKG_CHECK_MODULES(gtk, gtk+-2.0)
-fi
-
-AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" = "yes")
-AC_DEFINE(ENABLE_GTK)
-
AC_ARG_ENABLE(gio,
AS_HELP_STRING([--enable-gio],
[Enable dconf backend for GIO]),
@@ -57,7 +38,6 @@ AC_SUBST(dbussystemservicedir)
AC_OUTPUT([
common/Makefile
- editor/Makefile
writer/Makefile
config/Makefile
dconf/Makefile
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 1c6609f..3a3f395 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = -I$(top_srcdir)/dconf $(gio_CFLAGS) \
giomodules_LTLIBRARIES = libdconfsettings.la
-libdconfsettings_la_LIBADD = ../dconf/libdconf.la
+libdconfsettings_la_LIBADD = ../dconf/libdconf.la $(gio_LIBS)
libdconfsettings_la_SOURCES = \
dconfsettings.c \
dconfstorage.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]