[Tkabber-dev] [tclgpg commit] r44 - trunk

codesite-noreply at google.com codesite-noreply at google.com
Sat Nov 22 20:45:08 MSK 2008


Author: sgolovan
Date: Sat Nov 22 09:44:15 2008
New Revision: 44

Modified:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/aclocal.m4
    trunk/configure.in

Log:
	* Makefile.in, aclocal.m4, configure.in: Added all generated files
	  (not only Makefile and pkgIndex.tcl) to CONFIG_CLEAN_FILES, so they
	  will be removed on make distclean. Also, overridden
	  TEA_ADD_TCL_SOURCES macro to succeed if a file with suffix .in
	  exists.


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sat Nov 22 09:44:15 2008
@@ -7,6 +7,12 @@
  	* configure.in: Removed tclgpg.tcl from Tcl sources as it is a
  	  generated file.

+	* Makefile.in, aclocal.m4, configure.in: Added all generated files
+	  (not only Makefile and pkgIndex.tcl) to CONFIG_CLEAN_FILES, so they
+	  will be removed on make distclean. Also, overridden
+	  TEA_ADD_TCL_SOURCES macro to succeed if a file with suffix .in
+	  exists.
+
  2008-11-21  Sergei Golovan  <sgolovan at nes.ru>

  	* tclgpg.tcl, gpg.man: Implemented asynchronous mode for sign, verify,

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Sat Nov 22 09:44:15 2008
@@ -157,7 +157,7 @@
  DEFS		= @DEFS@ $(PKG_CFLAGS)

  # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
-CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
+CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@
  CLEANFILES	= @CLEANFILES@

  CPPFLAGS	= @CPPFLAGS@

Modified: trunk/aclocal.m4
==============================================================================
--- trunk/aclocal.m4	(original)
+++ trunk/aclocal.m4	Sat Nov 22 09:44:15 2008
@@ -7,3 +7,50 @@
  #
  # Add here whatever m4 macros you want to define for your package
  #
+
+#------------------------------------------------------------------------
+# TEA_ADD_TCL_SOURCES --
+#
+#	Specify one or more Tcl source files.  These should be platform
+#	independent runtime files.
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_TCL_SOURCES
+#------------------------------------------------------------------------
+AC_DEFUN([TEA_ADD_TCL_SOURCES], [
+    vars="$@"
+    for i in $vars; do
+	# check for existence, be strict because it is installed
+	if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/$i.in" ; then
+	    AC_MSG_ERROR([could not find tcl source file '${srcdir}/$i'  
or '${srcdir}/$i.in'])
+	fi
+	PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i"
+    done
+    AC_SUBST(PKG_TCL_SOURCES)
+])
+
+#------------------------------------------------------------------------
+# LOCAL_AC_OUTPUT --
+#
+#	Specify one or more files. They are added to CONFIG_CLEAN_FILES
+#	to be removed on make distclean, and passed to AC_OUTPUT macro.
+#
+# Arguments:
+#	one or more file names
+#
+# Results:
+#
+#	Defines and substs the following vars:
+#		PKG_TCL_SOURCES
+#------------------------------------------------------------------------
+AC_DEFUN([LOCAL_AC_OUTPUT], [
+    CONFIG_CLEAN_FILES="$@"
+    AC_SUBST(CONFIG_CLEAN_FILES)
+    AC_OUTPUT($@)
+])
+

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 22 09:44:15 2008
@@ -58,7 +58,7 @@
  TEA_ADD_LIBS([])
  TEA_ADD_CFLAGS([])
  TEA_ADD_STUB_SOURCES([])
-TEA_ADD_TCL_SOURCES([])
+TEA_ADD_TCL_SOURCES([tclgpg.tcl])

  #--------------------------------------------------------------------
  # A few miscellaneous platform-specific items:
@@ -160,4 +160,4 @@
  # which require substituting th AC variables in.  Include these here.
  #--------------------------------------------------------------------

-AC_OUTPUT([Makefile tclgpg.tcl pkgIndex.tcl])
+LOCAL_AC_OUTPUT([Makefile tclgpg.tcl pkgIndex.tcl])


More information about the Tkabber-dev mailing list