diff options
author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2010-07-22 14:17:26 +0200 |
---|---|---|
committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2010-07-22 14:17:26 +0200 |
commit | 6a6df18794657badfc5af0a14a8a2f1481fa39a0 (patch) | |
tree | f69c8a3bc28ccf48c3809bfe9db33ed6d892f25b | |
parent | 648da032599d696c34c9ff2bf9cd1de27987b7a3 (diff) | |
download | guile-6a6df18794657badfc5af0a14a8a2f1481fa39a0.tar.gz |
[maint] Avoid no-op config-subst for libguile/guile-func-name-check.
* configure.ac (libguile/guile-func-name-check): Remove ‘GUILE_CONFIG_SCRIPT’.
* libguile/Makefile.am (.c.doc): Look in $(srcdir) for awk script.
* libguile/guile-func-name-check: Rename from guile-func-name-check.in.
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | libguile/Makefile.am | 8 | ||||
-rw-r--r-- | libguile/guile-func-name-check (renamed from libguile/guile-func-name-check.in) | 0 |
3 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f4011725b..a79ec0d13 100644 --- a/configure.ac +++ b/configure.ac @@ -1656,7 +1656,6 @@ GUILE_CONFIG_SCRIPT([meta/gdb-uninstalled-guile]) GUILE_CONFIG_SCRIPT([meta/guile-tools]) GUILE_CONFIG_SCRIPT([libguile/guile-snarf]) GUILE_CONFIG_SCRIPT([libguile/guile-doc-snarf]) -GUILE_CONFIG_SCRIPT([libguile/guile-func-name-check]) GUILE_CONFIG_SCRIPT([libguile/guile-snarf-docs]) GUILE_CONFIG_SCRIPT([test-suite/standalone/test-use-srfi]) GUILE_CONFIG_SCRIPT([test-suite/standalone/test-fast-slot-ref]) diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 6a334731d..5897d03ac 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -63,7 +63,7 @@ gen-scmconfig.$(OBJEXT): gen-scmconfig.c fi ## Override default rule; this should run on BUILD host. -gen-scmconfig$(EXEEXT): $(gen_scmconfig_OBJECTS) $(gen_scmconfig_DEPENDENCIES) +gen-scmconfig$(EXEEXT): $(gen_scmconfig_OBJECTS) $(gen_scmconfig_DEPENDENCIES) $(AM_V_GEN) \ rm -f gen-scmconfig$(EXEEXT); \ if [ "$(cross_compiling)" = "yes" ]; then \ @@ -94,7 +94,7 @@ c-tokenize.$(OBJEXT): c-tokenize.c fi ## Override default rule; this should run on BUILD host. -guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile_filter_doc_snarfage_DEPENDENCIES) +guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile_filter_doc_snarfage_DEPENDENCIES) $(AM_V_GEN) \ rm -f guile_filter_doc_snarfage$(EXEEXT); \ if [ "$(cross_compiling)" = "yes" ]; then \ @@ -466,7 +466,7 @@ endif HAVE_LD_VERSION_SCRIPT # These are headers visible as <guile/mumble.h> -pkginclude_HEADERS = +pkginclude_HEADERS = # These are headers visible as <libguile/mumble.h>. modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/libguile @@ -667,7 +667,7 @@ AM_V_FILTER_0 = @echo " FILTER" $@; .c.x: $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts) .c.doc: - -$(AM_V_FILTER)$(AWK) -f ./guile-func-name-check $< && (./guile-snarf-docs $(snarfcppopts) $< | ./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; } + -$(AM_V_FILTER)$(AWK) -f $(srcdir)/guile-func-name-check $< && (./guile-snarf-docs $(snarfcppopts) $< | ./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; } $(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in diff --git a/libguile/guile-func-name-check.in b/libguile/guile-func-name-check index 8b4924e91..8b4924e91 100644 --- a/libguile/guile-func-name-check.in +++ b/libguile/guile-func-name-check |