tools: move generate-settings-spec to tools

diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 5517417..ea860d8 100644 (file)
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -1,30 +1,7 @@
-GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
-
 AUTOMAKE_OPTIONS = 1.7
 
 if ENABLE_DOC
 
-INCLUDES = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
-       -I$(top_srcdir)/libnm-util \
-       -I$(top_builddir)/libnm-util
-
-noinst_PROGRAMS = \
-       generate-settings-spec
-
-generate_settings_spec_SOURCES = \
-       $(GENERATE_SETTINGS_SPEC_SOURCE)
-
-generate_settings_spec_CPPFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-generate_settings_spec_LDADD = \
-       $(top_builddir)/libnm-util/libnm-util.la \
-       $(GLIB_LIBS) \
-       $(DBUS_LIBS)
-
 XSLTPROC = xsltproc --xinclude --nonet
 XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
 
@@ -43,9 +20,9 @@ spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
        mkdir -p $(builddir)/html/
        cp $@ $(builddir)/html/
 
-settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
+settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
        rm -f $(builddir)/$@
-       $(builddir)/generate-settings-spec book $(builddir)/$@
+       $(top_builddir)/tools/generate-settings-spec book $(builddir)/$@
 
 all: $(GENERATED_FILES)
 
@@ -81,7 +58,7 @@ CLEANFILES += $(GENERATED_FILES)
 
 else
 
-EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE)
+EXTRA_DIST =
 CLEANFILES =
 
 endif

diff --git a/tools/Makefile.am b/tools/Makefile.am
index dbbe18c..07d996d 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1 +1,25 @@
-EXTRA_DIST = doc-generator.xsl check-exports.sh glib-mkenums
+GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
+
+INCLUDES = \
+       -I$(top_srcdir)/include \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/libnm-util \
+       -I$(top_builddir)/libnm-util
+
+noinst_PROGRAMS = \
+       generate-settings-spec
+
+generate_settings_spec_SOURCES = \
+       $(GENERATE_SETTINGS_SPEC_SOURCE)
+
+generate_settings_spec_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+generate_settings_spec_LDADD = \
+       $(top_builddir)/libnm-util/libnm-util.la \
+       $(GLIB_LIBS) \
+       $(DBUS_LIBS)
+
+EXTRA_DIST = doc-generator.xsl check-exports.sh glib-mkenums \
+       $(GENERATE_SETTINGS_SPEC_SOURCE)

diff --git a/docs/api/generate-settings-spec.c b/tools/generate-settings-spec.c
similarity index 100%
rename from docs/api/generate-settings-spec.c
rename to tools/generate-settings-spec.c