[nautilus-actions: 37/45] Remove option to build command-line tools (as required Gtk+ is enough)

[Pierre Wieser <pwieser src gnome org>]

commit eb65d69076cc5328823dc79a795fdfa6e9931d27
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jul 29 22:23:31 2009 +0200

    Remove option to build command-line tools (as required Gtk+ is enough)

 ChangeLog                |    5 ++
 TODO                     |    6 +--
 configure.ac             |    3 -
 exports/.gitignore       |    3 +-
 m4/na-cmdline-tools.m4   |   95 ----------------------------------------------
 po/POTFILES.in           |    3 +
 src/Makefile.am          |    2 +-
 src/test/test-parse-uris |  Bin 27074 -> 0 bytes
 src/utils/Makefile.am    |    8 ++--
 9 files changed, 17 insertions(+), 108 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 35f933e..f62c531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-07-29 Pierre Wieser <pwieser trychlos org>
 
+	* exports/nautilus-actions.schema.in:
+	Remove files as it is rebuildable via nautilus-actions-schemas.
+
+	* m4/na-cmdline-tools.m4: Deleted file.
+
 	* m4/na-log-domains.m4:
 	Define a new log domain for test programs.
 
diff --git a/TODO b/TODO
index 4abe60c..b90c0de 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,8 @@
 
 - Implement the Help button in nact (or hide it meanwhile)
 
-- i18n doen't works in the command line tool and for some part of NACT 
-like the scheme list, it seems.
+- 'Grumz) i18n doen't works in the command line tool and for some part
+  of NACT like the scheme list, it seems..?
 
 - import and export assistants are seen as a distinct application in the
   task bar (there is a second NA icon) - gtk_window_set_transient_for()
@@ -25,7 +25,5 @@ like the scheme list, it seems.
 - NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR has nothing to do in configure.ac
   (not a configuration variable)
 
-- remove option to build or not utilities : always build all
-
 - configure.ac: distinguish between common, nautilus extension or gtk
   program to build nautilus_actions_flags/libs
diff --git a/configure.ac b/configure.ac
index e2b6b5d..41f572f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,9 +141,6 @@ NA_LOG_DOMAINS
 # a non-standard location ; lets specify this here
 NA_NAUTILUS_EXTDIR
 
-# building or not the commandline tools
-NA_COMMANDLINE_TOOLS
-
 # define NACT_MAINTAINER_MODE variable
 NA_IS_MAINTAINER_MODE
 
diff --git a/exports/.gitignore b/exports/.gitignore
index 6bec850..ff86976 100644
--- a/exports/.gitignore
+++ b/exports/.gitignore
@@ -1 +1,2 @@
-nautilus-actions.schema
+nautilus-actions.schemas
+nautilus-actions.schemas.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a1de56..474dc58 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,7 @@ src/nact/nact-application.c
 src/nact/nact-assistant.c
 src/nact/nact-assistant-export.c
 src/nact/nact-assistant-import.c
+src/nact/nact.desktop.in
 src/nact/nact-iaction-tab.c
 src/nact/nact-iadvanced-tab.c
 src/nact/nact-icommand-tab.c
@@ -13,5 +14,7 @@ src/nact/nact-imenubar.c
 src/nact/nact-main-window.c
 src/nact/nact-window.c
 src/nact/nact-xml-reader.c
+src/nact/nautilus-actions-config-tool.ui
 src/test/test-parse-uris.c
 src/utils/nautilus-actions-new.c
+src/utils/nautilus-actions-schemas.c
diff --git a/src/Makefile.am b/src/Makefile.am
index a339fbd..1e2cf1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,5 +31,5 @@ SUBDIRS = \
 	nact						\
 	plugin						\
 	test						\
-	$(OPTIONAL_SUBDIR)			\
+	utils						\
 	$(NULL)
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 391db84..fb3fec9 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -34,7 +34,7 @@ bin_PROGRAMS = \
 AM_CPPFLAGS += \
 	-I $(top_srcdir)/src							\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		\
-	$(NAUTILUS_ACTIONS_UTILS_CFLAGS)				\
+	$(NAUTILUS_ACTIONS_CFLAGS)						\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_UTILS}\"		\
 	$(NULL)
 
@@ -44,14 +44,14 @@ nautilus_actions_new_SOURCES = \
 
 nautilus_actions_new_LDADD = \
 	$(top_builddir)/src/common/libnact.la			\
-	$(NAUTILUS_ACTIONS_UTILS_LIBS)					\
+	$(NAUTILUS_ACTIONS_LIBS)						\
 	$(NULL)
 
 nautilus_actions_schemas_SOURCES = \
-	nautilus-actions-schema.c						\
+	nautilus-actions-schemas.c						\
 	$(NULL)
 
 nautilus_actions_schemas_LDADD = \
 	$(top_builddir)/src/common/libnact.la			\
-	$(NAUTILUS_ACTIONS_UTILS_LIBS)					\
+	$(NAUTILUS_ACTIONS_LIBS)						\
 	$(NULL)