|
From: <mr...@mr...> - 2004-05-15 22:48:34
|
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/05/15 12:56:09+02:00 mr...@fo... =
# fix pretty-printing in generated makefiles
# compatibility fix in generated C code
# =
# tools/tc2make
# 2004/05/15 12:56:08+02:00 mr...@fo... +29 -11
# pretty-printing in generated makefiles always works
# no mixing declarations with code in generated files
# =
# tc2.m4
# 2004/05/15 12:56:08+02:00 mr...@fo... +3 -4
# check whether depcomp will be used
# =
diff -Nru a/tc2.m4 b/tc2.m4
--- a/tc2.m4 Sun May 16 00:48:25 2004
+++ b/tc2.m4 Sun May 16 00:48:25 2004
@@ -48,10 +48,9 @@
AC_ERROR(TC2 not found.)
fi
AC_SUBST([TC2MAKE_FLAGS],["-I\$(top_srcdir)/interfaces -I$ac_aux_dir/interfaces"])
-AC_ARG_ENABLE([verbose], [AC_HELP_STRING([--enable-verbose],[verbose build])],
- [silent=3Dno],
- [silent=3Dyes])
-AM_CONDITIONAL([silent], [test $silent =3D yes])
+
+AM_CONDITIONAL(nodepcomp, test x$AMDEP_TRUE$am__fastdepCC_FALSE !=3D x)
+
patch -N <<\END
--- libtool~ Sat Jan 17 04:16:27 2004
+++ libtool Sat Jan 17 04:23:37 2004
diff -Nru a/tools/tc2make b/tools/tc2make
--- a/tools/tc2make Sun May 16 00:48:25 2004
+++ b/tools/tc2make Sun May 16 00:48:25 2004
@@ -360,6 +360,7 @@
my($fh, $what) =3D @_;
my $lsec;
=
+ print $fh " {\n" if $what eq 'get' or $what eq 'free';
if(grep $$_[1] =3D~ /\*/, @confs){
print $fh <<END_C if $what eq 'get';
void *cfs;
@@ -513,6 +514,7 @@
print $fh qq/ tcfree(sec);\n/;
print $fh qq/ }\n/;
}
+ print $fh " }\n" if $what eq 'get' or $what eq 'free';
}
=
# Generate a C file containing module information and init/shutdown
@@ -1054,16 +1056,34 @@
$extradist .=3D " Makefile.am.in" if exist_scm "Makefile.am.in";
my @interfaces =3D find_interfaces '.';
=
+ print AM <<'END_MAKEFILE';
+INSTALL_SCRIPT =3D echo " INSTALL $$p" && true " >/dev/null " && @INSTALL_SCRIPT@
+INSTALL_DATA =3D echo " INSTALL $$p" && true " >/dev/null " && @INSTALL_DATA@
+install_sh_DATA =3D echo " INSTALL $$p" && true " >/dev/null " && $(install_sh) -c -m 644
+TC2MAKE =3D echo ' TC2MAKE $@' && @TC2MAKE@ --quiet
+
+if nodepcomp
+TC2DEPCOMP =3D $(SHELL) $(top_srcdir)/depcomp
+TC2LIBTOOL =3D case $@ in \
+ *.o|*.lo) echo " CC $<";; \
+ install*) echo " INSTALL $$p";; \
+ esac; true " >/dev/null " && @LIBTOOL@ --quiet
+else
+TC2DEPCOMP =3D $(SHELL) -c 'echo " CC $<" && $(SHELL) $(top_srcdir)/depcomp "$$@"' depcomp
+TC2LIBTOOL =3D @LIBTOOL@ --quiet
+endif
+
+depcomp =3D $(TC2DEPCOMP)
+LINK =3D echo ' LD $@' && $(LIBTOOL) --mode=3Dlink $(CCLD) $(AM_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LIBTOOL =3D $(TC2LIBTOOL)
+
+TCCONF =3D $(PACKAGE).conf
+TC2MAKE_CMD =3D $(TC2MAKE) $(TC2MAKE_FLAGS) --top-srcdir=3D$(top_srcdir)
+CLEANFILES =3D $(BUILT_SOURCES) $(TCCONF)
+END_MAKEFILE
+
print AM <<END_MAKEFILE;
-INSTALL_SCRIPT =3D echo " INSTALL \$\$p" && true " >/dev/null " && \@INSTALL_SCRIPT@
-INSTALL_DATA =3D echo " INSTALL \$\$p" && true " >/dev/null " && \@INSTALL_DATA@
-install_sh_DATA =3D echo " INSTALL \$\$p" && true " >/dev/null " && \$(install_sh) -c -m 644
-TC2MAKE =3D echo ' TC2MAKE \$\@' && \@TC2MAKE@ --quiet
-LIBTOOL =3D case \$@ in *.lo) echo ' CC \$<';; src/*) echo ' LD \$\@';; install*) echo \" INSTALL \$\$p\";; esac; true \" >/dev/null \" && \@LIBTOOL@ --quiet
-
-TCCONF =3D \$(PACKAGE).conf
-TC2MAKE_CMD =3D \$(TC2MAKE) \$(TC2MAKE_FLAGS) --top-srcdir=3D\$(top_srcdir)
-CLEANFILES =3D \$(BUILT_SOURCES) \$(TCCONF)
EXTRA_DIST =3D $extradist
BUILT_SOURCES =3D
module_LTLIBRARIES =3D
@@ -1146,9 +1166,7 @@
\$(TC2MAKE) --top-srcdir=3D\$(top_srcdir) --package=3D\$(PACKAGE) --prefix=3D\$(prefix) --conf
=
.PHONY: \$(TCCONF)
-if silent
.SILENT:
-endif
END_MAKEFILE
cat 'Makefile.am.in', \*AM;
maybe_replace '_tc2_Makefile.am', 'Makefile.am';
|