summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw44@gmail.com>2013-08-09 22:26:08 +0800
committerLAN-TW <lantw44@gmail.com>2013-08-09 22:26:08 +0800
commitcf1fb6abcc8790fd1931f1b55f5bff0463d2351c (patch)
treefd7443c5da3980793953cea595370e2a512b8287
parentd3ad46871475900a50c93b0b3dae7cd7e273c749 (diff)
downloadgsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.tar
gsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.tar.gz
gsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.tar.bz2
gsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.tar.lz
gsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.tar.xz
gsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.tar.zst
gsoc2013-libgnome-autoar-cf1fb6abcc8790fd1931f1b55f5bff0463d2351c.zip
Move GSettings schema file into data directory
-rw-r--r--.gitignore6
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am11
-rw-r--r--data/org.gnome.desktop.archives.gschema.xml (renamed from gnome-autoar/org.gnome.desktop.archives.gschema.xml)0
-rw-r--r--gnome-autoar/Makefile.am9
6 files changed, 17 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index f44a96d..009028c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,9 +28,11 @@ m4/*.m4
missing
gnome-autoar/*-enum-types.[ch]
-gnome-autoar/*.enums.xml
-gnome-autoar/*.gschema.valid
gnome-autoar/gnome-autoar.pc
+data/*.enums.xml
+data/*.gschema.valid
+
tests/test-extract
+tests/test-create
tests/test-pref
diff --git a/Makefile.am b/Makefile.am
index 007def2..836d1c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
NULL =
-SUBDIRS = gnome-autoar tests
+SUBDIRS = gnome-autoar data tests
EXTRA_DISTS = \
autogen.sh \
diff --git a/configure.ac b/configure.ac
index 776df6c..07a66fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_CHECK_FUNCS([getgrnam getpwnam link mkfifo mknod stat])
AC_CONFIG_FILES([Makefile
gnome-autoar/Makefile
gnome-autoar/gnome-autoar.pc
+ data/Makefile
tests/Makefile])
AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..e5bc336
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,11 @@
+# vim: set sw=8 ts=8 sts=8 noet:
+
+NULL =
+
+gsettings_ENUM_NAMESPACE = org.gnome.desktop.archives
+gsettings_ENUM_FILES = $(top_srcdir)/gnome-autoar/autoar-pref.h
+
+gsettings_SCHEMAS = org.gnome.desktop.archives.gschema.xml
+
+@GSETTINGS_RULES@
+
diff --git a/gnome-autoar/org.gnome.desktop.archives.gschema.xml b/data/org.gnome.desktop.archives.gschema.xml
index 1d946c2..1d946c2 100644
--- a/gnome-autoar/org.gnome.desktop.archives.gschema.xml
+++ b/data/org.gnome.desktop.archives.gschema.xml
diff --git a/gnome-autoar/Makefile.am b/gnome-autoar/Makefile.am
index 8d951cb..0cdc2ed 100644
--- a/gnome-autoar/Makefile.am
+++ b/gnome-autoar/Makefile.am
@@ -2,8 +2,6 @@
NULL =
-noinst_PROGRAMS =
-
EXTRA_DIST = \
autoar-enum-types.h.template \
autoar-enum-types.c.template \
@@ -11,13 +9,6 @@ EXTRA_DIST = \
org.gnome.desktop.archives.gschema.xml \
$(NULL)
-gsettings_ENUM_NAMESPACE = org.gnome.desktop.archives
-gsettings_ENUM_FILES = autoar-pref.h
-
-gsettings_SCHEMAS = org.gnome.desktop.archives.gschema.xml
-
-@GSETTINGS_RULES@
-
lib_LTLIBRARIES = libgnome-autoar.la
libgnome_autoar_h_sources = \