[svn] commit: r1652 - in /trunk: ./ src/bin/auth/ src/bin/xfrin/ src/bin/xfrout/

[BIND 10 source code commits]

Author: jreed
Date: Fri Mar 26 19:12:39 2010
New Revision: 1652

Log:
Rename spec "pre" files to also include "spec" in the filename.

Some CLEANFILES cleanup (don't need to list files already known
via configure.ac's AC_OUTPUT).

Add b10-xfrout to CLEANFILES to make sure it is removed on a make clean.

Added:
    trunk/src/bin/auth/auth.spec.pre.in
      - copied unchanged from r1651, trunk/src/bin/auth/auth.pre.in
    trunk/src/bin/xfrin/xfrin.spec.pre.in
      - copied unchanged from r1651, trunk/src/bin/xfrin/xfrin.pre.in
    trunk/src/bin/xfrout/xfrout.spec.pre.in
      - copied unchanged from r1651, trunk/src/bin/xfrout/xfrout.pre.in
Removed:
    trunk/src/bin/auth/auth.pre.in
    trunk/src/bin/xfrin/xfrin.pre.in
    trunk/src/bin/xfrout/xfrout.pre.in
Modified:
    trunk/configure.ac
    trunk/src/bin/auth/Makefile.am
    trunk/src/bin/xfrin/Makefile.am
    trunk/src/bin/xfrout/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar 26 19:12:39 2010
@@ -384,10 +384,10 @@
            src/bin/cmdctl/tests/cmdctl_test
            src/bin/xfrin/tests/xfrin_test
            src/bin/xfrin/xfrin.py
-           src/bin/xfrin/xfrin.pre
+           src/bin/xfrin/xfrin.spec.pre
            src/bin/xfrin/run_b10-xfrin.sh
            src/bin/xfrout/xfrout.py
-           src/bin/xfrout/xfrout.pre
+           src/bin/xfrout/xfrout.spec.pre
            src/bin/xfrout/tests/xfrout_test
            src/bin/xfrout/run_b10-xfrout.sh
            src/bin/bind10/bind10.py
@@ -403,7 +403,7 @@
            src/bin/msgq/msgq.py
            src/bin/msgq/msgq_test
            src/bin/msgq/run_msgq.sh
-           src/bin/auth/auth.pre
+           src/bin/auth/auth.spec.pre
            src/bin/auth/spec_config.h
            src/lib/config/tests/data_def_unittests_config.h
            src/lib/python/isc/config/tests/config_test

Modified: trunk/src/bin/auth/Makefile.am
==============================================================================
--- trunk/src/bin/auth/Makefile.am (original)
+++ trunk/src/bin/auth/Makefile.am Fri Mar 26 19:12:39 2010
@@ -8,7 +8,7 @@
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
-CLEANFILES = *.gcno *.gcda auth.pre auth.spec
+CLEANFILES = *.gcno *.gcda auth.spec
 
 man_MANS = b10-auth.8
 EXTRA_DIST = $(man_MANS) b10-auth.xml
@@ -20,8 +20,8 @@
 
 endif
 
-auth.spec: auth.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.pre >$@
+auth.spec: auth.spec.pre
+	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.spec.pre >$@
 
 pkglibexec_PROGRAMS = b10-auth
 b10_auth_SOURCES = auth_srv.cc auth_srv.h

Modified: trunk/src/bin/xfrin/Makefile.am
==============================================================================
--- trunk/src/bin/xfrin/Makefile.am (original)
+++ trunk/src/bin/xfrin/Makefile.am Fri Mar 26 19:12:39 2010
@@ -5,7 +5,7 @@
 b10_xfrindir = $(DESTDIR)$(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
 
-CLEANFILES = b10-xfrin xfrin.pre xfrin.spec
+CLEANFILES = b10-xfrin xfrin.spec
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
@@ -18,8 +18,8 @@
 
 endif
 
-xfrin.spec: xfrin.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.pre >$@
+xfrin.spec: xfrin.spec.pre
+	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.spec.pre >$@
 
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix

Modified: trunk/src/bin/xfrout/Makefile.am
==============================================================================
--- trunk/src/bin/xfrout/Makefile.am (original)
+++ trunk/src/bin/xfrout/Makefile.am Fri Mar 26 19:12:39 2010
@@ -5,12 +5,12 @@
 b10_xfroutdir = $(DESTDIR)$(pkgdatadir)
 b10_xfrout_DATA = xfrout.spec
 
-CLEANFILES=	xfrout.py xfrout.pre  xfrout.spec
+CLEANFILES=	b10-xfrout xfrout.spec
 
 EXTRA_DIST = tests/xfrout_test.py
 
-xfrout.spec: xfrout.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.pre >$@
+xfrout.spec: xfrout.spec.pre
+	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.spec.pre >$@
 
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix