Moved ghex.desktop.in, ghex2.schemas, gtkhex.pc.in to 'data' subdir

Makefile.am

@@ -4,41 +4,16 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-schemas-install
 
-SUBDIRS = po help src icons
-
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = ghex2.schemas
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtkhex.pc
+SUBDIRS = data po help src icons
 
 EXTRA_DIST =			\
-	ghex.desktop.in		\
 	gnome-doc-utils.make	\
 	omf.make		\
 	xmldocs.make		\
 	COPYING-DOCS    	\
 	intltool-extract.in	\
 	intltool-merge.in	\
-	intltool-update.in	\
-	$(schema_DATA)
-
-desktopdir = $(datadir)/applications
-desktop_in_files = ghex.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-#Install the ghex2 schema file
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-else
-install-data-local:
-endif
-
-CLEANFILES =			\
-	$(desktop_DATA)
+	intltool-update.in
 
 DISTCLEANFILES =		\
 	intltool-extract	\

configure.ac

@@ -85,6 +85,7 @@ GNOME_DOC_INIT([0.9.0],,
 
 AC_CONFIG_FILES([
 Makefile
+data/Makefile
 po/Makefile.in
 src/Makefile
 help/Makefile
@@ -94,5 +95,5 @@ icons/22x22/Makefile
 icons/24x24/Makefile
 icons/32x32/Makefile
 icons/48x48/Makefile
-gtkhex.pc])
+data/gtkhex.pc])
 AC_OUTPUT

data/Makefile.am

@@ -0,0 +1,26 @@
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = ghex2.schemas
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gtkhex.pc
+
+EXTRA_DIST =			\
+	ghex.desktop.in		\
+	$(schema_DATA)
+
+desktopdir = $(datadir)/applications
+desktop_in_files = ghex.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
+#Install the ghex2 schema file
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+else
+install-data-local:
+endif
+
+CLEANFILES =			\
+	$(desktop_DATA)

po/POTFILES.in

@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-ghex.desktop.in
+data/ghex.desktop.in
 src/chartable.c
 src/config.c
 src/converter.c