X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/173090e6bbd3f78dc815ed6c0c13d34ab3a230ab..5fcc98348b560f1e40261044d59048d2c4ff016f:/vars.am

diff --git a/vars.am b/vars.am
index 2f3336e..af6c14e 100644
--- a/vars.am
+++ b/vars.am
@@ -7,7 +7,7 @@
 
 ###----- Licensing notice ---------------------------------------------------
 ###
-### This file is part of the Sensble Object Design, an object system for C.
+### This file is part of the Sensible Object Design, an object system for C.
 ###
 ### SOD is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -42,6 +42,10 @@ BUILT_SOURCES		 =
 bin_PROGRAMS		 =
 check_PROGRAMS		 =
 pkginclude_HEADERS	 =
+noinst_DATA		 =
+TESTS			 =
+
+dist_man_MANS		 =
 
 CLEANFILES		+= $(BUILT_SOURCES)
 
@@ -55,33 +59,55 @@ AM_CPPFLAGS		 = $(SOD_INCLUDES)
 LDADD			 = $(top_builddir)/lib/libsod.la
 
 ###--------------------------------------------------------------------------
+### Standard configuration substitutions.
+
+## Substitute tags in files.
+confsubst                = $(top_srcdir)/config/confsubst
+
+SUBSTITUTIONS = \
+	prefix=$(prefix) exec_prefix=$(exec_prefix) \
+	libdir=$(libdir) includedir=$(includedir) \
+	bindir=$(bindir) sbindir=$(sbindir) \
+	srcdir=$(srcdir) \
+	PACKAGE=$(PACKAGE) VERSION=$(VERSION) ASDF_VERSION=$(ASDF_VERSION)
+
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_ = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @echo "  SUBST    $@";
+SUBST = $(V_SUBST)$(confsubst)
+
+###--------------------------------------------------------------------------
 ### Translating SOD input files.
 
 ## The tool location.
 SOD			 = $(top_builddir)/src/sod
 
 ## Silent rules treatment.
-V_SOD_c			 = $(V_SOD_c_$(V))
-V_SOD_c_		 = $(V_SOD_c_$(AM_DEFAULT_VERBOSITY))
-V_SOD_c_0		 = @echo "  SOD[c] $@";
-V_SOD_h			 = $(V_SOD_h_$(V))
-V_SOD_h_		 = $(V_SOD_h_$(AM_DEFAULT_VERBOSITY))
-V_SOD_h_0		 = @echo "  SOD[h] $@";
+V_SOD_c			 = $(V_SOD_c_@AM_V@)
+V_SOD_c_		 = $(V_SOD_c_@AM_DEFAULT_V@)
+V_SOD_c_0		 = @echo "  SOD[c]   $@";
+V_SOD_h			 = $(V_SOD_h_@AM_V@)
+V_SOD_h_		 = $(V_SOD_h_@AM_DEFAULT_V@)
+V_SOD_h_0		 = @echo "  SOD[h]   $@";
 
 ## Build rules.
 SUFFIXES		+= .c .h .sod
-.sod.c: $(SOD); $(V_SOD_c)$(SOD) -tc $<
-.sod.h: $(SOD); $(V_SOD_h)$(SOD) -th $<
+.sod.c:; $(V_SOD_c)$(SOD) -M -tc $<
+.sod.h:; $(V_SOD_h)$(SOD) -M -th $<
+%.c: %.sod $(SOD); $(V_SOD_c)$(SOD) -M -tc $<
+%.h: %.sod $(SOD); $(V_SOD_h)$(SOD) -M -th $<
+
+DISTCLEANFILES		+= *.c-dep *.h-dep
 
 ###--------------------------------------------------------------------------
 ### Silent rules for Lisp.
 
-V_DUMP			 = $(V_DUMP_$(V))
-V_DUMP_			 = $(V_DUMP_$(AM_DEFAULT_VERBOSITY))
-V_DUMP_0		 = @echo "  DUMP   $@";
+V_DUMP			 = $(V_DUMP_@AM_V@)
+V_DUMP_			 = $(V_DUMP_@AM_DEFAULT_V@)
+V_DUMP_0		 = @echo "  DUMP     $@";
 
-V_TEST			 = $(V_TEST_$(V))
-V_TEST_			 = $(V_TEST_$(AM_DEFAULT_VERBOSITY))
-V_TEST_0		 = @echo "  TEST   $@";
+V_TEST			 = $(V_TEST_@AM_V@)
+V_TEST_			 = $(V_TEST_@AM_DEFAULT_V@)
+V_TEST_0		 = @echo "  TEST     $@";
 
 ###----- That's all, folks --------------------------------------------------