[fU-cvs] libfunutil/toc/make toc.qmake.at,1.1,1.2

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv32211/toc/make

Modified Files:
	toc.qmake.at 
Log Message:
mass commit: an absolute boatload of build-related fixes.

Index: toc.qmake.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/toc.qmake.at,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toc.qmake.at	28 Aug 2003 09:15:25 -0000	1.1
+++ toc.qmake.at	10 Dec 2003 21:14:39 -0000	1.2
@@ -1,6 +1,45 @@
 # toc.qmake.at: template makefile for toc.qmake, part of the
 # toc build process. This is filtered at the end of the configure
 # process. toc.qmake may be included by your qmake files.
+#
+# many of the $$vars seen here come from toc.@PACKAGE_NAME@.make,
+# and all @TOKENS@ are replaced at configure-time.
 
-top_srcdir = @TOC_TOP_SRCDIR@
-include( @TOC_SHARED_QMAKEFILE@ )
+top_srcdir = @TOP_SRCDIR@
+
+include( $$top_srcdir/toc.@PACKAGE_NAME@.configure.make )
+
+
+
+QTDIR = @QTDIR@
+QTBINDIR = @QTBINDIR@
+QTINCDIR = @QTINCDIR@
+QTLIBDIR = @QTLIBDIR@
+#  -lqt (or -lqt-mt?) if we have Qt, nothing if we don't.
+LQT = @LQT@
+UIC = @UIC@
+MOC = @MOC@
+QMAKE = @QMAKE@
+
+
+############################ most of this comes from the gnu_cpp_tools toc test:
+CC = @CC@
+INCLUDES += @INCLUDES@
+#  C preprocessor flags, used in compiling C & C++ files.
+CPPFLAGS += @CPPFLAGS@
+CPPFLAGS += $$INCLUDES -DHAVE_CONFIG_H=1
+#  Optimization flags (-g or -On) used in compiling C & C++ files.
+OPT = @OPT@
+#  Warning flags (-Wall, -Werror, -woff, etc.) used in compiling C & C++ files.
+WARN = @WARN@
+#  C flags, used in compiling C files.  Includes $$OPT and $$WARN.
+QMAKE_CFLAGS += @CFLAGS@
+QMAKE_CFLAGS += $$OPT $$WARN
+#  C++ flags, used in compiling C++ files.  Includes $$OPT and $$WARN.
+QMAKE_CXXFLAGS += @CXXFLAGS@
+QMAKE_CXXFLAGS += $$OPT $$WARN
+#  ld flags, used in linking binaries.
+QMAKE_LFLAGS += @LDFLAGS@
+###########################
+
+include( $$top_srcdir/toc.@PACKAGE_NAME@.qmake )