Thread: [libcw-cvs] [CVS] Module src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

CVSROOT    : /cvsroot/libcw
Module     : src
Branch tags: branch-threading
Commit time: 2001-10-06 02:54:18 UTC

Modified files:
  Tag: branch-threading
     libcwd/example-project/Makefile.am
     libcwd/example-project/configure.in

Added files:
  Tag: branch-threading
     libcwd/example-project/debug.h.maintainer

Removed files:
  Tag: branch-threading
     libcwd/example-project/debug.h
     libcwd/example-project/maintMakefile.in

Log message:

Work in progress: Moving nodebug.h contents from include/libcw/debug.h to nodebug.h.
These contents will now be put inside the example-project/debug.h file directly.

---------------------- diff included ----------------------
Index: src/libcwd/example-project/Makefile.am
diff -u src/libcwd/example-project/Makefile.am:1.1 src/libcwd/example-project/Makefile.am:1.1.2.1

--- src/libcwd/example-project/Makefile.am:1.1	Mon Sep 11 12:39:38 2000
+++ src/libcwd/example-project/Makefile.am	Mon Nov  5 18:54:08 2001
@@ -3,15 +3,11 @@
 AUTOMAKE_OPTIONS = foreign
 
 bin_PROGRAMS = program
-program_SOURCES = debug.cc program.cc
 
-include_HEADERS = debug.h sys.h@MAINTAINER_MODE_FALSE@ nodebug.h
-BUILT_SOURCES =@MAINTAINER_MODE_TRUE@ nodebug.h
-EXTRA_DIST =@MAINTAINER_MODE_TRUE@ nodebug.h
+include_HEADERS = debug.h sys.h
+program_SOURCES = debug.cc program.cc
 
 # --------------- Maintainer's Section
 
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure stamp-h.in Makefile.in install-sh missing mkinstalldirs
-
-@MAINTAINER_MODE_TRUE@include maintMakefile
 
Index: src/libcwd/example-project/configure.in
diff -u src/libcwd/example-project/configure.in:1.6 src/libcwd/example-project/configure.in:1.6.2.1
--- src/libcwd/example-project/configure.in:1.6	Sun Aug 19 19:03:26 2001
+++ src/libcwd/example-project/configure.in	Mon Nov  5 18:54:08 2001
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.6 $)dnl
+AC_REVISION($Revision: 1.6.2.1 $)dnl
 
 dnl General initialization of `autoconf' variables.
 dnl Ensure that the directory specified with --srcdir was correct
@@ -49,5 +49,5 @@
 fi
 
 dnl Generate output files.
-AC_OUTPUT([Makefile maintMakefile])
+AC_OUTPUT([Makefile])
 
Index: src/libcwd/example-project/debug.h
diff -u src/libcwd/example-project/debug.h:1.3.2.1 src/libcwd/example-project/debug.h:removed
--- src/libcwd/example-project/debug.h:1.3.2.1	Thu Sep 27 18:13:57 2001
+++ src/libcwd/example-project/debug.h	Mon Nov  5 18:54:18 2001
@@ -1,30 +0,0 @@
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#ifndef CWDEBUG
-#include "nodebug.h"
-
-#else // CWDEBUG
-
-#ifndef DEBUGCHANNELS
-#define DEBUGCHANNELS ::myproject::debug::channels
-#endif
-#include <libcw/debug.h>
-
-namespace myproject {
-  namespace debug {
-    namespace channels {
-      namespace dc {
-	using namespace ::libcw::debug::channels::dc;
-
-	// Add new debug channels here.
-	extern ::libcw::debug::channel_ct custom;
-
-      }
-    }
-  }
-}
-
-#endif // CWDEBUG
-
-#endif // DEBUG_H
Index: src/libcwd/example-project/debug.h.maintainer
diff -u /dev/null src/libcwd/example-project/debug.h.maintainer:1.1.2.1
--- /dev/null	Mon Nov  5 18:54:18 2001
+++ src/libcwd/example-project/debug.h.maintainer	Mon Nov  5 18:54:08 2001
@@ -0,0 +1,36 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#ifndef CWDEBUG
+
+@NODEBUGMACROS@
+
+#else // CWDEBUG
+
+#ifndef DEBUGCHANNELS
+// This must be defined before <libcw/debug.h> is included and must be the
+// name of the namespace containing your `dc' namespace (see below).
+// You can use any namespace(s) you like, except existing namespaces
+// (like ::, ::std and ::libcw).
+#define DEBUGCHANNELS ::myproject::debug::channels
+#endif
+#include <libcw/debug.h>
+
+namespace myproject {
+  namespace debug {
+    namespace channels {
+      namespace dc {
+	using namespace ::libcw::debug::channels::dc;
+
+	// Add the declaration of new debug channels here
+	// and their definition in a custom debug.cc file.
+	extern ::libcw::debug::channel_ct custom;
+
+      } // namespace dc
+    } // namespace DEBUGCHANNELS
+  }
+}
+
+#endif // CWDEBUG
+
+#endif // DEBUG_H
Index: src/libcwd/example-project/maintMakefile.in
diff -u src/libcwd/example-project/maintMakefile.in:1.6.2.1 src/libcwd/example-project/maintMakefile.in:removed
--- src/libcwd/example-project/maintMakefile.in:1.6.2.1	Thu Oct 11 21:15:50 2001
+++ src/libcwd/example-project/maintMakefile.in	Mon Nov  5 18:54:18 2001
@@ -1,21 +0,0 @@
-# $Id: maintMakefile.in,v 1.6.2.1 2001/10/12 04:15:50 libcw Exp $
-#
-# Maintainers Makefile, a makefile with maintainer rules.
-#
-# This makefile is only used when --enable-maintainer-mode was passed to
-# configure.  The targets in this file are used to generate files that
-# might require special tools (or like in the case of nodebug.h,
-# need the header files of libcwd to be installed).  These generated
-# files are put into the distribution so that ordinairy users don't need
-# to generate them.
-
-CPPFLAGS=@CPPFLAGS@
-
-nodebug.h: maintMakefile macrotest.cc debug.h
-	g++ -dM -E $(CPPFLAGS) macrotest.cc | sed -e 's/#define \([^ ]*\).*/#undef \1/' > phase1.h
-	g++ -dM -E $(CPPFLAGS) -DPHASE2 macrotest.cc 2>/dev/null | egrep -v '(#define __|_H *$$|DEBUG|LIBCWD_)' | sort > nodebug.h
-	rm -f phase1.h
-
-# See the maintMakefile.in in the libcwd distribution for more
-# interesting ideas.
-
----------------------- End of diff -----------------------




Thread: [libcw-cvs] [CVS] Module src

Abandoned project

libcw-cvs-patches