|
From: Carlo W. <li...@us...> - 2001-12-09 23:52:58
|
CVSROOT : /cvsroot/libcw
Module : src
Branch tags: branch-threading
Commit time: 2001-11-09 23:52:56 UTC
Modified files:
Tag: branch-threading
libcwd/Makefile.am libcwd/example-project/configure.in
libcwd/example-project/program.cc
Added files:
Tag: branch-threading
libcwd/example-project/acconfig.h
Log message:
Example project bug fixes.
---------------------- diff included ----------------------
Index: src/libcwd/Makefile.am
diff -u src/libcwd/Makefile.am:1.30.2.13 src/libcwd/Makefile.am:1.30.2.14
--- src/libcwd/Makefile.am:1.30.2.13 Sun Dec 9 11:29:55 2001
+++ src/libcwd/Makefile.am Sun Dec 9 15:52:46 2001
@@ -34,14 +34,14 @@
# --------------- Maintainer's Section
-dist-hook: documentation
+dist-hook: example-project/debug.h documentation
cp -pr $(srcdir)/documentation $(distdir)/documentation
find $(distdir)/documentation -name CVS -print | xargs rm -rf
mkdir $(distdir)/example-project
for i in `grep '^/' $(srcdir)/example-project/CVS/Entries | cut -d/ -f2`; do \
cp -p $(srcdir)/example-project/$$i $(distdir)/example-project; \
done
- rm $(distdir)/example-project/debug.h.maintainer
+ rm $(distdir)/example-project/debug.h.maintainer $(distdir)/example-project/macrotest.cc
cp -p $(srcdir)/example-project/debug.h $(distdir)/example-project
chmod +x $(distdir)/install-sh
mkdir $(distdir)/debian
Index: src/libcwd/example-project/acconfig.h
diff -u /dev/null src/libcwd/example-project/acconfig.h:1.1.2.1
--- /dev/null Sun Dec 9 15:52:56 2001
+++ src/libcwd/example-project/acconfig.h Sun Dec 9 15:52:46 2001
@@ -0,0 +1,2 @@
+// Defined if libcdw is available.
+#undef HAVE_LIBCWD
Index: src/libcwd/example-project/configure.in
diff -u src/libcwd/example-project/configure.in:1.6.2.1 src/libcwd/example-project/configure.in:1.6.2.2
--- src/libcwd/example-project/configure.in:1.6.2.1 Mon Nov 5 18:54:08 2001
+++ src/libcwd/example-project/configure.in Sun Dec 9 15:52:46 2001
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.6.2.1 $)dnl
+AC_REVISION($Revision: 1.6.2.2 $)dnl
dnl General initialization of `autoconf' variables.
dnl Ensure that the directory specified with --srcdir was correct
dnl by demanding that it contains `debug.h'.
-AC_INIT(debug.h)
+AC_INIT(program.cc)
dnl Include --enable-maintainer-mode option.
AM_MAINTAINER_MODE
@@ -46,6 +46,7 @@
LDFLAGS=\"-L/usr/local/lib\" CPPFLAGS=\"-I/usr/local/include\" ./configure])])])
CXXFLAGS="-DCWDEBUG $CXXFLAGS"
+ AC_DEFINE(HAVE_LIBCWD)
fi
dnl Generate output files.
Index: src/libcwd/example-project/program.cc
diff -u src/libcwd/example-project/program.cc:1.2 src/libcwd/example-project/program.cc:1.2.2.1
--- src/libcwd/example-project/program.cc:1.2 Wed Oct 4 13:59:24 2000
+++ src/libcwd/example-project/program.cc Sun Dec 9 15:52:46 2001
@@ -10,7 +10,7 @@
Dout(dc::custom, "This is debug output, written to a custom channel (see ./debug.h and ./debug.cc)");
- cout << "This program works" << endl;
+ std::cout << "This program works" << std::endl;
return 0;
}
----------------------- End of diff -----------------------
|