Menu
▾
▴
[fU-cvs] libfunutil Makefile,1.14,1.15 configure.libfunutil,1.23,1.24 toc.libfunUtil.make.at,1.2,1.3 toc_shared.make.at,1.25,1.26 toc_shared.qmake.at,1.6,1.7
|
From: <sg...@us...> - 2003-12-10 21:14:41
|
Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv32211
Modified Files:
Makefile configure.libfunutil toc.libfunUtil.make.at
toc_shared.make.at toc_shared.qmake.at
Log Message:
mass commit: an absolute boatload of build-related fixes.
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile 14 Oct 2003 03:11:17 -0000 1.14
+++ Makefile 10 Dec 2003 21:14:38 -0000 1.15
@@ -21,7 +21,7 @@
DISTCLEAN_FILES += *~ toc_shared.make toc_shared.qmake
-DIST_FILES += configure toc_shared.make.at toc_shared.qmake.at
+DIST_FILES += configure $(wildcard *.at)
DIST_FILES += configure.$(PACKAGE_NAME)
DIST_FILES += README README.bt README.toc COPYING CHANGES
ifeq (1,$(configure_with_buildtool))
Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.libfunutil 23 Nov 2003 19:04:37 -0000 1.23
+++ configure.libfunutil 10 Dec 2003 21:14:38 -0000 1.24
@@ -10,9 +10,9 @@
toc_add_config PACKAGE_COPYRIGHT="GNU General Public License, version 2. Copyright (c) 2000-2003 Rusty Ballinger (bo...@so...) and stephan beal (sg...@us...)."
-INCLUDES="$INCLUDES -I\$(top_srcdir)/include"
+# INCLUDES="$INCLUDES -I\$(top_srcdir)/include"
# XXX this one is temporary
-LDFLAGS="$LDFLAGS -L\$(top_srcdir)/lib/fun"
+# LDFLAGS="$LDFLAGS -L\$(top_srcdir)/lib/funUtil"
toc_run_fail gnu_cpp_tools
@@ -76,6 +76,6 @@
echo ==============================================================
toc_run_fail toc_project_makefile
-
+toc_run_fail toc_project_makefile toc.${PACKAGE_NAME}.qmake
return 0
Index: toc.libfunUtil.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc.libfunUtil.make.at,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- toc.libfunUtil.make.at 19 Nov 2003 22:40:09 -0000 1.2
+++ toc.libfunUtil.make.at 10 Dec 2003 21:14:38 -0000 1.3
@@ -1,10 +1,45 @@
#!/do/not/make
#^^^ only to help emacs out.
+INCLUDES += -I$(top_srcdir)/include
+
CLEAN_FILES += $(wildcard *.o *~)
configure_enable_s11n = @configure_enable_s11n@
ifeq (1,$(configure_enable_s11n))
include $(top_srcdir)/toc.s11n.make
-endif
\ No newline at end of file
+endif
+
+SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH="$(top_srcdir)/lib/funUtil:$$LD_LIBRARY_PATH"
+
+# enable/disable 'buildtool'. This is here because i can't do
+# a make dist because some BT-related files are missing. ;)
+configure_with_buildtool = @configure_with_buildtool@
+ifeq (1,$(configure_with_buildtool))
+BUILDTOOL_BIN = @BUILDTOOL_BIN@
+else
+BUILDTOOL_BIN =
+endif
+
+# Qt stuff.
+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@
+
+# fun API stuff. Well, not fun as in the fun kind of fun.
+FUN_UTIL_WITH_QT = @FUN_UTIL_WITH_QT@
+FUN_API_QSTRING = @FUN_API_QSTRING@
+FUN_API_STD_STRING = @FUN_API_STD_STRING@
+
+
+
+DISTCLEAN_FILES += @TOC_MAKEFILE@ @TOC_DISTCLEAN_FILES@ toc.qmake moc_*.cpp *.moc.cpp
+CLEAN_FILES += *~ $(OBJECTS)
+DIST_FILES += Makefile
Index: toc_shared.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- toc_shared.make.at 17 Nov 2003 20:27:18 -0000 1.25
+++ toc_shared.make.at 10 Dec 2003 21:14:38 -0000 1.26
@@ -1,123 +1,8 @@
#!/usr/bin/make
# ^^^ this is only to help emacs
-# toc_shared.make.at is the template file for toc_shared.make.
-# The .at file is processed by the configure script
-# to create toc_shared.make. Makefiles should have this line:
-#
-# include toc.make
-#
-# and configure will take care of getting toc_shared.make included.
-#
-# Note that toc.make is auto-generated and will create these vars before
-# this file is include:
-#
-# top_srcdir = relative path to top of build tree
-# TOC_SHARED_MAKEFILE = relative path to toc_shared.make. You normally shouldn't need this.
-#
-# Keep in mind that this is a real makefile, and may contain any makefile
-# constructs.
-
-default: all
-all:
-
-SHELL = @SHELL@
-
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_LICENSE = @PACKAGE_LICENSE@
-PACKAGE_COPYRIGHT = @PACKAGE_COPYRIGHT@
-
-toc_tocdir = $(top_srcdir)/toc
-# ^^^^ todo? assign this from toc_core.sh?
-
-top_includesdir = $(top_srcdir)/include
-top_libdir = $(top_srcdir)/lib
-top_bindir = $(top_srcdir)/bin
-SET_LD_LIBRARY_PATH = LD_LIBRARY_PATH="$(top_srcdir)/lib/funUtil:$$LD_LIBRARY_PATH"
-
-# these are mainly for autotools compatibility:
-prefix = @prefix@
-exec_prefix = ${prefix}
-bindir = $(exec_prefix)/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE_NAME@
-pkglibdir = $(libdir)/@PACKAGE_NAME@
-pkgincludedir = $(includedir)/@PACKAGE_NAME@
-pkgdocsdir = $(datadir)/doc/@PACKAGE_NAME@
-
-toc_makesdir = $(toc_tocdir)/make
-
-
-# enable/disable 'buildtool'. This is here because i can't do
-# a make dist because some BT-related files are missing. ;)
-configure_with_buildtool = @configure_with_buildtool@
-ifeq (1,$(configure_with_buildtool))
-BUILDTOOL_BIN = @BUILDTOOL_BIN@
-else
-BUILDTOOL_BIN =
-endif
-
-
-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).
-CFLAGS += @CFLAGS@
-CFLAGS += $(OPT) $(WARN)
-# C++ flags, used in compiling C++ files. Includes $(OPT) and $(WARN).
-CXXFLAGS += @CXXFLAGS@
-CXXFLAGS += $(OPT) $(WARN)
-# ld flags, used in linking binaries.
-LDFLAGS += @LDFLAGS@
-
-AWK_BIN = @AWK@
-PERL_BIN = @PERL@
-SED_BIN = @SED@
-TAR_BIN = @TAR@
-GZIP_BIN = @GZIP@
-INSTALLER_BIN = @INSTALLER_BIN@
-
-DOXYGEN_BIN = @DOXYGEN_BIN@
-
-# Qt stuff.
-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@
-
-# fun API stuff. Well, not fun as in the fun kind of fun.
-FUN_UTIL_WITH_QT = @FUN_UTIL_WITH_QT@
-FUN_API_QSTRING = @FUN_API_QSTRING@
-FUN_API_STD_STRING = @FUN_API_STD_STRING@
-
-
+# obsoleted by the new dump-everything approach toc takes for config vars.
+# Project-specific code should go in toc.$(PACKAGE_NAME).make.at
-DISTCLEAN_FILES += @TOC_MAKEFILE@ @TOC_DISTCLEAN_FILES@ toc.qmake moc_*.cpp *.moc.cpp
-CLEAN_FILES += *~ $(OBJECTS)
-DIST_FILES += Makefile
-include $(toc_makesdir)/toc_mainincludes.make
-include $(toc_makesdir)/tests.make
Index: toc_shared.qmake.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.qmake.at,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- toc_shared.qmake.at 29 Aug 2003 10:40:17 -0000 1.6
+++ toc_shared.qmake.at 10 Dec 2003 21:14:38 -0000 1.7
@@ -1,44 +1,2 @@
+# OBSOLETE. Use toc.$(PACKAGE_NAME).qmake.at instead.
-INCLUDEPATH += $$top_srcdir/include
-
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_NAME = @PACKAGE_NAME@
-
-FUN_LIB_DIR = $$top_srcdir/lib/funUtil
-FUN_LIB_SO = $$FUN_LIB_DIR/libfunUtil.so
-
-CONFIG += qt warn_off debug
-
-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@
-
-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.
-LDFLAGS += @LDFLAGS@
-
-
-exists( $$QTDIR/lib/libqt-mt* ) {
- # message( "Configuring for multi-threaded Qt..." )
- CONFIG += thread
-}
|
