Menu
▾
▴
libfunutil-cvs — CVS commit messages for libfunUtil
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(58) |
Sep
(79) |
Oct
(41) |
Nov
(80) |
Dec
(23) |
|---|
|
From: <bo...@us...> - 2003-09-03 08:47:43
|
Update of /cvsroot/libfunutil/libfunutil/data
In directory sc8-pr-cvs1:/tmp/cvs-serv26248
Added Files:
libfunUtil.bpf.in Makefile.bt
Log Message:
initial checkin of some files used by buildtool
--- NEW FILE: libfunUtil.bpf.in ---
# $Id: libfunUtil.bpf.in,v 1.1 2003/09/03 08:47:40 bozo Exp $
# pkgflags file
#
# This file is mostly useful for packages providing libraries.
# If not needed (i.e., if the package is a program), remove it.
#
BT_PREFIX="@BT_PREFIX@"
BT_DIR_LIB="@BT_DIR_LIB@"
BT_DIR_INCLUDE="@BT_DIR_INCLUDE@"
bpf_name="@BT_PKG_NAME@"
bpf_descr="@BT_PKG_COMMENT@"
bpf_version="@BT_PKG_VERSION@"
#bpf_libs="-L${BT_DIR_LIB} -lyour_library"
#bpf_cflags="-I${BT_DIR_INCLUDE}"
--- NEW FILE: Makefile.bt ---
.include "../bt_config.mk"
BT_FILES_CLEANDIR+= libfunUtil.bpf
#XXX not sure what was supposed to happen here, but this was generated
#XXX by "buildtool wizard", and it looks broken.
#real-install:
# @
# @ libfunUtil.bpf
.include <bt.prog.mk>
|
|
From: <bo...@us...> - 2003-09-03 08:46:45
|
Update of /cvsroot/libfunutil/libfunutil/data In directory sc8-pr-cvs1:/tmp/cvs-serv26147/data Log Message: Directory /cvsroot/libfunutil/libfunutil/data added to the repository |
|
From: <sg...@us...> - 2003-09-01 05:13:41
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv2900/toc/tests Removed Files: testtemplate.sh Log Message: removed: not needed. --- testtemplate.sh DELETED --- |
|
From: <sg...@us...> - 2003-09-01 05:13:04
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv2825/toc/tests Removed Files: demo_failure.sh Log Message: removed: not needed. --- demo_failure.sh DELETED --- |
|
From: <sg...@us...> - 2003-09-01 05:12:32
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv2787/toc/tests Removed Files: compiler_cpp.sh Log Message: removed: obsoleted long ago by gnu_cpp_tools. --- compiler_cpp.sh DELETED --- |
|
From: <sg...@us...> - 2003-09-01 05:09:53
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv2514/toc/make
Added Files:
c_bins.make makerules.C_BINS_FROM_SOURCES
Log Message:
egg
--- NEW FILE: c_bins.make ---
#!make
# usage:
# set:
# C_BINS_FROM_SOURCES = foo bar
# foo_bin_SOURCES = foo.c foo2.c
# bar_bin_SOURCES = bar.c bar2.c foobar.c
# optional: foo_bin_OBJECTS = somethingdifferent.o
# optional: foo_bin_CFLAGS = -DCOMPILING_FOO=1 -I/somewhere/different
#
# all: bins
#
# This compiles, all in one go, 'bar' from $(bar_bin_SOURCES)
C_BINS_FROM_SOURCES_MAKEFILE = $(toc_makesdir)/c_bins.make
ifneq (,$(C_BINS_FROM_SOURCES))
C_BINS_FROM_SOURCES_RULES_GENERATOR = $(toc_makesdir)/makerules.C_BINS_FROM_SOURCES
C_BINS_FROM_SOURCES_COMMON_DEPS += Makefile $(C_BINS_FROM_SOURCES_MAKEFILE)
C_BINS_FROM_SOURCES_DEPSFILE = .toc.C_BINS_FROM_SOURCES.make
CLEAN_FILES += $(C_BINS_FROM_SOURCES_DEPSFILE)
$(C_BINS_FROM_SOURCES_DEPSFILE): $(C_BINS_FROM_SOURCES_COMMON_DEPS) $(C_BINS_FROM_SOURCES_RULES_GENERATOR)
ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS))))
@echo "$(MAKECMDGOALS): skipping C_BINS_FROM_SOURCES rules generation."
else
@echo "Generating C_BINS_FROM_SOURCES rules."; \
$(call toc_generate_rules,C_BINS_FROM_SOURCES,$(C_BINS_FROM_SOURCES)) > $@
endif
# ^^^ making clean?
-include $(C_BINS_FROM_SOURCES_DEPSFILE)
deps: $(C_BINS_FROM_SOURCES_DEPSFILE)
endif
# ^^^ got $(C_BINS_FROM_SOURCES)?
--- NEW FILE: makerules.C_BINS_FROM_SOURCES ---
#!/bin/sh
# creates some makefile code for the $(C_BINS_FROM_SOURCES) var
test -z "$1" && {
echo "usage: $0 appone [apptwo ...]"
exit 1
}
echo "C_BINS_FROM_SOURCES_COMMON_DEPS += $0"
for t in $@; do
cat <<EOF
$t: \$(C_BINS_FROM_SOURCES_COMMON_DEPS) \$(${t}_bin_SOURCES) \$(${t}_bin_OBJECTS)
@echo "Building C[++] binary [$t]."; set -x; \$(call toc_compile_c_binary,${t},)
CLEAN_FILES += $t
bin-$t: $t
bins: bin-$t
EOF
done
|
|
From: <sg...@us...> - 2003-09-01 05:09:33
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv2488/toc/make
Added Files:
toc_functions.make toc_mainincludes.make
Log Message:
egg
--- NEW FILE: toc_functions.make ---
#!make
# ^^^ let's help out emacs :/
# this file contains more-or-less generic call()able Make functions.
######################################################################
# toc_atparse_file call()able:
# Similar to the toc shell function of the same name, except for different arguments:
# Filters an input file using toc's at-parser (e.g., @TOKENS@), and sends output to $2.
# $2 is only updated if the generated output is different, so it is dependencies-safe.
# Args:
# $1 = input template
# $2 = output file
# $3 = list of properties, e.g. FOO=bar BAR=foo
TOC_ATPARSER_BIN = $(toc_bindir)/atsign_parse
ifeq (,$(wildcard $(TOC_ATPARSER_BIN)))
$(error Could not find TOC_ATPARSER_BIN at $(TOC_ATPARSER_BIN)!)
endif
toc_atparse_file = \
$(TOC_ATPARSER_BIN) $(3) < $(1) > $(2).tmp; \
if cmp -s $(2).tmp $(2); then rm -f $(2).tmp; echo "$(2) is up to date."; \
else mv -f $(2).tmp $@; echo "Updated $(2)."; fi
######################################################################
# toc_generate_rules() callable:
# $1 = rules name, e.g., INSTALL_XXX, BIN_PROGRAMS, etc.
# $2 = arguments to pass to makerules.$(1)
# Sample:
# .toc.foo.deps:
# $(toc_generate_rules,foo,arg1=val1 -arg2)
# Executes script $(toc_makesdir)/makerules.foo, passing it $(2).
toc_generate_rules = $(toc_makesdir)/makerules.$(1) $(2)
######################################################################
# toc_get_makefile_var call()able:
# $1 = VAR_NAME
# $2 = optional filename (defaults to Makefile)
toc_get_makefile_var = $(shell $(toc_tocdir)/bin/getMakefileVar $(1) $(2))
#toc_get_makefile_var = $(shell fn=$(2); test -z "$$fn" && fn=Makefile; ${MAKE} -np -f $$fn | grep '^$(1)')
######################################################################
# toc_compile_c_binary call()able function:
# compiles/links list of source files [$($(1)_bin_SOURCES) $($(1)_bin_OBJECTS)and $(2)]
# to create $(1). It uses the optional $($(1)_bin_CFLAGS).
toc_compile_c_binary = $(CC) $(CFLAGS) $($(1)_bin_CFLAGS) -o $(1) $($(1)_bin_SOURCES) $($(1)_bin_OBJECTS) $(2)
######################################################################
# toc_made_c_deps call()able function:
# generates dependencies for c/c++ files.
# $1 = C/C++ sources to process.
# $2 = INCLUDES (e.g., -I. -I/usr/include, with or without the -I).
# $2 defaults to $(INCLUDES).
toc_make_c_deps = inc="$(patsubst %,-I%,$(wildcard $(patsubst -I%,%,$(2))))"; \
test -z "$$inc" && inc="$(INCLUDES)"; \
$(DEPSGEN_BIN) $$inc -- $(1)
--- NEW FILE: toc_mainincludes.make ---
include $(toc_makesdir)/toc_functions.make
include $(toc_makesdir)/cleaner.make
include $(toc_makesdir)/subdirs_traverser.make
include $(toc_makesdir)/deps.make
include $(toc_makesdir)/install.make
include $(toc_makesdir)/dist.make
|
|
From: <sg...@us...> - 2003-09-01 05:01:09
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv1491 Modified Files: Makefile Log Message: now uses TOC_OVERRIDE_CLEAN workaround. :/ Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 31 Aug 2003 20:21:08 -0000 1.10 +++ Makefile 1 Sep 2003 05:01:04 -0000 1.11 @@ -1,29 +1,27 @@ -# Sample toc-driven top-level Makefile. +# top-level makefile for the libfunutil project + default: all +TOC_OVERRIDE_CLEAN = 1# tells cleaner to let us initialize clean/distclean deps -SUBDIRS = lib util tests include -SUBDIRS += doc +SUBDIRS = lib util tests include doc SUBDIRS += toc - # note: we re-order the clean deps to make sure the shared makefile and config.h # don't get deleted until near the end. cleanorder = toc doc tests util lib include . -clean: $(patsubst %,clean-%,$(cleanorder)) -distclean: $(patsubst %,distclean-%,$(cleanorder)) +clean: $(addprefix clean-,$(cleanorder)) +distclean: $(addprefix distclean-,$(cleanorder)) include toc.make - # include toc.make to get toc's goodies # Unfortunately, toc.make must be included after SUBDIRS (if any) are declared. -# That's an implementation detail i'll deal with later. toc.make: @echo "You must run configure once before running make."; exit 1 -CLEAN_FILES += config.log $(wildcard $(top_srcdir)/.toc*) +CLEAN_FILES += $(wildcard .toc*) DISTCLEAN_FILES += *~ toc_shared.make toc_shared.qmake @@ -35,6 +33,6 @@ DIST_FILES += data/libfunUtil.bpf.in data/Makefile.bt endif -all: $(TOC_SHARED_MAKEFILE) subdirs +all: subdirs |
|
From: <sg...@us...> - 2003-09-01 04:59:53
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv1183/toc/make Modified Files: qmake2make.make Log Message: instead of checking for QTDIR now checks for QMAKE. Index: qmake2make.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/qmake2make.make,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- qmake2make.make 1 Sep 2003 00:17:03 -0000 1.17 +++ qmake2make.make 1 Sep 2003 04:59:49 -0000 1.18 @@ -15,8 +15,8 @@ QMAKE_QMAKE2MAKE_MAKE = $(toc_makesdir)/qmake2make.make -ifeq (,$(wildcard $(QTDIR))) -$(error $(QMAKE_QMAKE2MAKE_MAKE) requires the QTDIR var. Maybe you need to run the qt test?) +ifeq (,$(wildcard $(QMAKE))) +$(error this file requires the QMAKE var to point to the qmake binary. Maybe you need to run the qt test or add @QMAKE@ to your shared makefile?) endif ifeq (,$(DEPSGEN_BIN)) include $(toc_makesdir)/deps.make |
|
From: <sg...@us...> - 2003-09-01 04:59:26
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv1147/toc/make
Modified Files:
cleaner.make subdirs_traverser.make
Log Message:
major re-thinking vis-a-vis clean/distclean and subdirs.
Index: cleaner.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cleaner.make,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cleaner.make 31 Aug 2003 20:22:15 -0000 1.5
+++ cleaner.make 1 Sep 2003 04:59:22 -0000 1.6
@@ -6,6 +6,20 @@
# include path/to/this/file
#
# That creates 'clean' and 'distclean' targets which will nuke those files/dirs.
+#
+# Special case: cleaning subdirs in an order other than that specified in $(SUBDIRS):
+#
+# Set TOC_OVERRIDE_CLEAN to 1 /before including toc.make/ in any given
+# makefile in order to have 'clean' clean/distclean targets, i.e., one you can
+# re-order all you want by using dependencies.
+# e.g.:
+# clean: $(addprefix clean-,bin sbin lib doc tests .)
+# or:
+# clean: precleaner subdirs-clean clean-. aftercleaner
+#
+# If you do this the default clean/distclean behaviour will be to do NOTHING,
+# so you must be sure to set the dist/clean deps.
+
.PHONY: clean distclean clean-.
@@ -19,17 +33,33 @@
done; \
exit 0
+
+clean-%: # assume $* is a subdirectory
+ @$(call toc_make_subdirs,$*,clean)
+distclean-%: # assume $* is a subdirectory
+ @$(call toc_make_subdirs,$*,distclean)
+
+
clean-.:
@$(call toc_clean_files,$(wildcard $(CLEAN_FILES)))
-clean-subdirs:
-clean: clean-subdirs clean-.
-# we clean depth-first to keep some top-level generated files from being nuked :/
-# todo: fix this by moving those files into a generated-files-only dir.
-#
-# Note: distclean does not depend on clean so that a recursive distclean does not
-# climb down the tree twice :/
-
distclean-.:
@$(call toc_clean_files,$(wildcard $(CLEAN_FILES) $(DISTCLEAN_FILES)))
-distclean-subdirs:
-distclean: distclean-subdirs distclean-.
+
+subdirs-clean: # implemented elsewhere
+subdirs-distclean: # implemented elsewhere
+clean-subdirs: subdirs-clean
+distclean-subdirs: subdirs-distclean
+
+
+# toc-XXX stubs: don't use these directly
+toc-clean: subdirs-clean clean-.
+toc-distclean: subdirs-distclean distclean-.
+# we clean depth-first to keep some top-level generated files from being nuked :/
+
+ifeq (1,$(TOC_OVERRIDE_CLEAN))
+clean:
+distclean:
+else
+clean: toc-clean
+distclean: toc-distclean
+endif
Index: subdirs_traverser.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/subdirs_traverser.make,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- subdirs_traverser.make 31 Aug 2003 20:26:43 -0000 1.10
+++ subdirs_traverser.make 1 Sep 2003 04:59:22 -0000 1.11
@@ -5,54 +5,49 @@
# include path/to/subdirs_traverser.make
# all: subdirs
# NOTES:
-# - Does not properly handle "." in SUBDIRS.
# - SUBDIRS must be defined BEFORE including this file. This is a
# side-effect of the implementation: make expands this var
# at compile time, so to say, so it can build the proper subdir
# targets. Adding to the SUBDIRS var later doesn't affect which targets
-# get created.
+# get created, but ARE necessary for targets like install-subdirs :/.
+#
+# DO NOT put "." in the SUBDIRS!
+#
+
# toc_make_subdirs call()able function:
# $1 = list of dirs
# $2 = target
toc_make_subdirs = \
test "x$(1)" = "x" && exit 0; \
- tgt="$(2)"; test -z "$$tgt" && tgt="all"; \
- for b in $(1) ""; do test -z "$$b" && continue; \
+ tgt="$(2)"; test x = "x$$tgt" && tgt="all"; \
+ for b in $(1) "x"; do test "x" = "$$b" && break; \
pwd=$$(pwd); \
cd $$pwd/$$b || exit; \
echo "Making $$tgt in $$pwd/$${b}"; \
- ${MAKE} $$tgt || exit; \
+ ${MAKE} --no-print-directory $$tgt || exit; \
cd $$pwd || exit; \
done
-SUBDIRS_CLEANERS = $(patsubst %,clean-%,$(SUBDIRS))
-SUBDIRS_DISTCLEANERS = $(patsubst %,distclean-%,$(SUBDIRS))
-$(SUBDIRS_CLEANERS) $(SUBDIRS_DISTCLEANERS):
- @dir=$@;target=$$dir; dir=$${dir##*-}; target=$${target%%-*}; \
- ${MAKE} -C $$dir $$target
-
-.PHONY: subdirs $(SUBDIRS) $(SUBDIRS_CLEANERS) $(SUBDIRS_DISTCLEANERS) \
- distclean-subdirs clean-subdirs
+.PHONY: subdirs distclean-subdirs clean-subdirs $(SUBDIRS)
+# note that this only works for subdirs defined BEFORE including this file:
$(SUBDIRS):
- @$(call toc_make_subdirs,$@)
+ ${MAKE} -C $@
+# @$(call toc_make_subdirs,$@)
-# make $* as a subdirectory:
-subdir-%: # makes $* subdir
- @$(call toc_make_subdirs,$*)
-clean-%: # cleans $* subdir
- @$(call toc_make_subdirs,$*,clean)
-# @test -d "$*" || exit 0;
-distclean-%:
- @$(call toc_make_subdirs,$*,distclean)
-subdirs-%: # calls $* target in all $(SUBDIRS)
+
+subdir-%: # make $* as a subdirectory
+ @test "x$*" = "x." && exit 0; $(call toc_make_subdirs,$*)
+
+subdirs-%: ## calls $* target in all $(SUBDIRS)
@$(call toc_make_subdirs,$(SUBDIRS),$*)
subdirs: $(addprefix subdir-,$(SUBDIRS))
+#subdirs: subdirs-all
+# ${MAKE} $(addprefix subdir-,$(SUBDIRS))
+#subdirs-all
+# @$(call toc_make_subdirs,$(SUBDIRS),all)
-clean-subdirs: $(patsubst %,clean-%,$(SUBDIRS))
-
-distclean-subdirs: $(patsubst %,distclean-%,$(SUBDIRS))
|
|
From: <sg...@us...> - 2003-09-01 04:59:04
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv1073/toc/make
Modified Files:
makerules.SHARED_LIBS
Log Message:
Changed from LIBS to LIBEXECS.
Index: makerules.SHARED_LIBS
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/makerules.SHARED_LIBS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- makerules.SHARED_LIBS 28 Aug 2003 09:16:56 -0000 1.1
+++ makerules.SHARED_LIBS 1 Sep 2003 04:59:01 -0000 1.2
@@ -20,17 +20,16 @@
\$(call toc_link_shared_lib,${t})
install-so-${sofile}:
- @\$(call toc_make_install_so,${sofile},\$(${t}_so_MAJOR),\$(${t}_so_MINOR),\$(${t}_so_PATCH),\$(INSTALL_LIBS_DEST))
+ @\$(call toc_make_install_so,${sofile},\$(${t}_so_MAJOR),\$(${t}_so_MINOR),\$(${t}_so_PATCH),\$(INSTALL_LIBEXECS_DEST))
uninstall-so-${sofile}:
- @\$(call toc_make_uninstall,${sofile} ${sofile}.\$(${t}_so_MAJOR) ${sofile}.\$(${t}_so_MAJOR).\$(${t}_so_MINOR) ${sofile}.\$(${t}_so_MAJOR).\$(${t}_so_MINOR).\$(${t}_so_PATCH),\$(INSTALL_LIBS_DEST))
+ @\$(call toc_make_uninstall,${sofile} ${sofile}.\$(${t}_so_MAJOR) ${sofile}.\$(${t}_so_MAJOR).\$(${t}_so_MINOR) ${sofile}.\$(${t}_so_MAJOR).\$(${t}_so_MINOR).\$(${t}_so_PATCH),\$(INSTALL_LIBEXECS_DEST))
-install-LIBS: install-so-${sofile}
-uninstall-LIBS: uninstall-so-${sofile}
+install-LIBEXECS: install-so-${sofile}
+uninstall-LIBEXECS: uninstall-so-${sofile}
libs-static: lib-${t}
-INSTALL_LIBS += ${sofile}
EOF
done
|
|
From: <sg...@us...> - 2003-09-01 04:58:42
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv1029/toc/make
Modified Files:
makerules.INSTALL_XXX
Log Message:
added install-symlinks deps.
Index: makerules.INSTALL_XXX
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/makerules.INSTALL_XXX,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- makerules.INSTALL_XXX 31 Aug 2003 20:23:02 -0000 1.3
+++ makerules.INSTALL_XXX 1 Sep 2003 04:58:38 -0000 1.4
@@ -25,6 +25,7 @@
install: install-${tgt}
uninstall: uninstall-${tgt}
install-update: install-${tgt}-update
+install-symlink: install-${tgt}-symlink
# end INSTALL_${tgt} rules
EOF
|
|
From: <sg...@us...> - 2003-09-01 04:58:26
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv983/toc/make
Modified Files:
install.make
Log Message:
quoting-related fixes.
Index: install.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- install.make 31 Aug 2003 21:34:36 -0000 1.23
+++ install.make 1 Sep 2003 04:58:22 -0000 1.24
@@ -48,15 +48,16 @@
# This whole echo/grep thing is to force it to work on some of my
# older machines where more sane approaches don't seem to work.
-TOC_MAKE_INSTALL_GREP_KLUDGE = test $(shell echo $(1) "" | grep -q '[a-zA-Z0-9]'; echo $$?) = 0 || exit 0
+# TOC_MAKE_INSTALL_GREP_KLUDGE = test $(shell echo $(1) "" | grep -q '[a-zA-Z0-9]'; echo $$?) = 0 || exit 0
+TOC_MAKE_INSTALL_GREP_KLUDGE =
# toc_make_install call()able:
# $1=file list
# $2=destdir
# $3=flags for $(INSTALLER_BIN)
-toc_make_install = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
+toc_make_install = test "x$(1)" = x && exit 0; \
test -d $(2) || mkdir -p $(2) || exit; \
- for b in $(1) ""; do test -z "$$b" && continue; \
+ for b in $(1) "x"; do test "x$$b" = "xx" && break; \
b=$$(basename $$b); \
target=$(2)/$$b; \
cmd="$(INSTALLER_BIN) $(3) $$b $$target"; echo $$cmd; $$cmd || exit; \
@@ -64,18 +65,18 @@
# toc_make_install_update: identical to toc_make_install
# but does not update the target if it is the same as the source.
-toc_make_install_update = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
+toc_make_install_update = test "x$(1)" = x && exit 0; \
test -d $(2) || mkdir -p $(2) || exit; \
for b in $(1) ""; do test -z "$$b" && continue; \
- b=$$(basename $$b); \
- target=$(2)/$$b; \
- cmp $$target $$b > /dev/null 2>&1 && continue; \
- cmd="$(INSTALLER_BIN) $(3) $$b $$target"; echo $$cmd; $$cmd || exit; \
+ b="$$(basename $$b)"; \
+ target="$(2)/$$b"; \
+ cmp "$$target" "$$b" > /dev/null 2>&1 && continue; \
+ cmd="$(INSTALLER_BIN) $(3) $$b $$target"; echo "$$cmd"; $$cmd || exit; \
done
# toc_make_uninstall call()able:
# removes all files listed in $(1) from target directory $(2)
-toc_make_uninstall = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
+toc_make_uninstall = test "x$(1)" = x && exit 0; \
test -e "$(2)" || exit 0; \
for b in $(1) ""; do test -z "$$b" && continue; \
fp="$(2)/$$b"; test -e "$$fp" || continue; \
@@ -88,13 +89,15 @@
# Note that symlinks must be linked to absolute paths here, because we cannot
# easily/reliably make a relative path from the target directory back to
# the install source:
-toc_make_install_symlink = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
+toc_make_install_symlink = test "x$(1)" = x && exit 0; \
test -d $(2) || mkdir -p $(2) || exit; \
for b in $(1) ""; do test -z "$$b" && continue; \
- target=$(2)/$$b; \
- pwd=$$(pwd); \
- test $$target -ef $$b && continue; \
- echo "Symlinking $$target"; ln -s -f $$pwd/$$b $$target || exit $$?; \
+ target="$(2)/$$b"; \
+ pwd="$$(pwd)"; \
+ src="$$pwd/$$b"; \
+ test "$$target" -ef "$$src" && continue; \
+ test -f "$$target" && rm "$$target"; \
+ echo "Symlinking $$target"; ln -s -f "$$src" "$$target" || exit $$?; \
done
# toc_make_install_so: installs foo.so.X.Y.Z and symlinks foo.so, foo.so.X and foo.so.X.Y to it,
@@ -102,13 +105,13 @@
# $1 = so name (foo.so)
# $2-4 = Major, Minor, Patch version numbers
# $5 = destination directory
-toc_make_install_so = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
+toc_make_install_so = test "x$(1)" = x && exit 0; \
test -d $(5) || mkdir -p $(5) || exit; \
wholename=$(1).$(2).$(3).$(4); \
target=$(5)/$$wholename; \
test $$wholename -ef $$target || { \
echo "Installing/symlinking $$target"; \
- cmd="$(INSTALLER_BIN) -s $$wholename $$target"; \
+ cmd="$(INSTALLER_BIN) -m 0755 $$wholename $$target"; \
$$cmd || exit; \
}; \
cd $(5); \
@@ -127,7 +130,8 @@
INSTALLER_BIN_FLAGS_BINS = -s -m 0755
INSTALLER_BIN_FLAGS_NONBINS = -m 0644
-INSTALLER_BIN_FLAGS_LIBS = -m 0755
+INSTALLER_BIN_FLAGS_LIBS = -m 0644
+INSTALLER_BIN_FLAGS_LIBEXECS = -m 0755
# default install flags for the installable file categories:
@@ -135,7 +139,7 @@
INSTALL_SBINS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_BINS)
INSTALL_LIBS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBS)
INSTALL_PACKAGE_LIBS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBS)
-INSTALL_LIBEXECS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBS)
+INSTALL_LIBEXECS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBEXECS)
INSTALL_HEADERS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS)
INSTALL_PACKAGE_HEADERS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS)
INSTALL_PACKAGE_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS)
@@ -152,7 +156,7 @@
# todo? move this into the configure process?
$(INSTALL_DEPS_FILE): $(INSTALL_MAKEFILE) $(INSTALL_XXX_GENERATOR)
ifneq (,$(strip $(filter clean distclean,$(MAKECMDGOALS))))
- @echo "$(MAKECMDGOALS): skipping INSTALL_XXX rules generation."
+# @echo "$(MAKECMDGOALS): skipping INSTALL_XXX rules generation."
else
@echo "Generating rules for INSTALL_XXX."; \
$(call toc_generate_rules,INSTALL_XXX,\
@@ -160,31 +164,30 @@
SBINS=sbin \
LIBS=lib \
PACKAGE_LIBS='lib/$$(PACKAGE_NAME)' \
- LIBEXECS=libexec \
+ LIBEXECS=lib \
HEADERS=include \
PACKAGE_HEADERS='include/$$(PACKAGE_NAME)' \
PACKAGE_DATA='share/$$(PACKAGE_NAME)' \
DOCS='share/doc/$$(PACKAGE_NAME)' \
) > $@
endif
-
-include $(INSTALL_DEPS_FILE)
-install: $(INSTALL_DEPS_FILE)
-.PHONY: install-. uninstall-.
deps: $(INSTALL_DEPS_FILE)
+
+.PHONY: install-. uninstall-.
+subdirs-install: # implemented elsewhere
install: install-. install-subdirs
-install-update: install-subdirs-update
-install-subdirs:
- @$(call toc_make_subdirs,$(SUBDIRS),install)
-install-subdirs-symlink:
- @$(call toc_make_subdirs,$(SUBDIRS),install-symlink)
-install-subdirs-update:
- @$(call toc_make_subdirs,$(SUBDIRS),install-update)
-uninstall-subdirs:
- @$(call toc_make_subdirs,$(SUBDIRS),uninstall)
+install-update: install-.-update install-subdirs-update
+install-symlink: install-.-symlink install-subdirs-symlink
+install-subdirs: subdirs-install
+install-subdirs-symlink: subdirs-install-symlink
+install-subdirs-update: subdirs-install-update
+uninstall-subdirs: subdirs-uninstall
uninstall: uninstall-. uninstall-subdirs
-# implement these to hook in to the start of the install:
+# implement these to hook in to the start of the install. Untested. :/
install-.:
+install-.-update:
+install-.-symlink:
uninstall-.:
|
|
From: <sg...@us...> - 2003-09-01 04:58:06
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv948/toc/make Modified Files: deps.make Log Message: asthetic changes only. Index: deps.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/deps.make,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- deps.make 1 Sep 2003 00:18:14 -0000 1.10 +++ deps.make 1 Sep 2003 04:58:03 -0000 1.11 @@ -18,13 +18,13 @@ ifneq (,$(SOURCE_FILES_TO_DEP)) -TOC_C_DEPSFILE = .toc.deps.c.make +TOC_C_DEPSFILE = .toc.C_DEPS.make $(TOC_C_DEPSFILE): $(DEPSGEN_BIN) $(SOURCE_FILES_TO_DEP) Makefile $(TOC_C_DEPS_MAKEFILE) ifneq (,$(strip $(filter clean distclean,$(MAKECMDGOALS)))) - @echo "$(MAKECMDGOALS): skipping source code dependencies generation." + @echo "$(MAKECMDGOALS): skipping C_DEPS rules generation." else @test -n "$(SOURCE_FILES_TO_DEP)" || exit 0; \ - echo "Generating source file dependencies for $(DEPS_C_SOURCES_GLOB)"; \ + echo "Generating C_DEPS rules for $(DEPS_C_SOURCES_GLOB)"; \ $(call toc_make_c_deps,$(SOURCE_FILES_TO_DEP),) > $@ -include $(TOC_C_DEPSFILE) endif |
|
From: <sg...@us...> - 2003-09-01 04:57:51
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv886/toc/make Modified Files: cpp_static_libs.make Log Message: asthetic changes only. Index: cpp_static_libs.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_static_libs.make,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cpp_static_libs.make 31 Aug 2003 20:23:02 -0000 1.6 +++ cpp_static_libs.make 1 Sep 2003 04:57:46 -0000 1.7 @@ -31,7 +31,7 @@ ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS)))) @echo "$(MAKECMDGOALS): skipping STATIC_LIBS rules generation." else - @echo "Generating rules for STATIC_LIBS."; \ + @echo "Generating STATIC_LIBS rules."; \ $(call toc_generate_rules,STATIC_LIBS,$(STATIC_LIBS)) > $@ endif -include $(STATIC_LIBS_DEPSFILE) |
|
From: <sg...@us...> - 2003-09-01 04:57:36
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv862/toc/make Modified Files: cpp_dynamic_libs.make Log Message: asthetic changes only. Index: cpp_dynamic_libs.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_dynamic_libs.make,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- cpp_dynamic_libs.make 31 Aug 2003 20:23:01 -0000 1.9 +++ cpp_dynamic_libs.make 1 Sep 2003 04:57:32 -0000 1.10 @@ -64,13 +64,13 @@ # to ensure that .so files are installed in a unix-friendly manner we need to implement # some install rules for them... -SHARED_LIBS_DEPSFILE = .toc.deps.SHARED_LIBS.make +SHARED_LIBS_DEPSFILE = .toc.SHARED_LIBS.make deps: $(SHARED_LIBS_INSTALL_RULES) $(SHARED_LIBS_DEPSFILE): Makefile $(SHARED_LIBS_MAKEFILE) $(SHARED_LIBS_RULES_GENERATOR) ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS)))) @echo "$(MAKECMDGOALS): skipping SHARED_LIBS rules generation." else - @echo "Generating rules for SHARED_LIBS."; \ + @echo "Generating SHARED_LIBS rules."; \ $(call toc_generate_rules,SHARED_LIBS,$(SHARED_LIBS)) > $@ endif -include $(SHARED_LIBS_DEPSFILE) |
|
From: <sg...@us...> - 2003-09-01 00:22:31
|
Update of /cvsroot/libfunutil/libfunutil/tests/funUtil In directory sc8-pr-cvs1:/tmp/cvs-serv26924 Modified Files: Makefile Log Message: removed a way-obsolete comment line. Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/tests/funUtil/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile 31 Aug 2003 00:50:26 -0000 1.22 +++ Makefile 1 Sep 2003 00:22:28 -0000 1.23 @@ -14,8 +14,6 @@ CLEAN_FILES += $(QMAKES) $(wildcard *.so *.so.*) LDFLAGS += -lfunUtil -BIN_PROGRAMS = testStrings - DIST_FILES += $(wildcard *.qmake *.cpp *.h *.xml *.c++ Makefile) ifeq (1,$(configure_with_buildtool)) DIST_FILES += Makefile.bt @@ -46,8 +44,8 @@ run: test-local + +BIN_PROGRAMS = testStrings testStrings_bin_OBJECTS = testStrings.o testStrings_bin_LDADD += $(LQT) - -# include $(toc_makesdir)/cpp_helper.make include $(toc_makesdir)/cpp_bins.make |
|
From: <sg...@us...> - 2003-09-01 00:19:45
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv26629
Modified Files:
makerules.BIN_PROGRAMS
Log Message:
added CLEAN_FILES additions
Index: makerules.BIN_PROGRAMS
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/makerules.BIN_PROGRAMS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- makerules.BIN_PROGRAMS 31 Aug 2003 20:23:02 -0000 1.2
+++ makerules.BIN_PROGRAMS 1 Sep 2003 00:19:42 -0000 1.3
@@ -10,6 +10,7 @@
cat <<EOF
$t: \$(BIN_PROGRAMS_COMMON_DEPS) \$(${t}_bin_OBJECTS)
@echo "Linking binary [$t]."; set -x; \$(call toc_link_binary,${t},)
+CLEAN_FILES += $t
bin-$t: $t
bins: bin-$t
EOF
|
|
From: <sg...@us...> - 2003-09-01 00:19:27
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin In directory sc8-pr-cvs1:/tmp/cvs-serv26589 Modified Files: Makefile Log Message: moved mkdep from DISTCLEAN_FILES to CLEAN_FILES? Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 29 Aug 2003 05:25:09 -0000 1.4 +++ Makefile 1 Sep 2003 00:19:23 -0000 1.5 @@ -8,4 +8,5 @@ relativePathToSharedMakefile -DISTCLEAN_FILES += mkdep +CLEAN_FILES += mkdep + |
|
From: <sg...@us...> - 2003-09-01 00:19:04
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin In directory sc8-pr-cvs1:/tmp/cvs-serv26526 Modified Files: mkdep.c Log Message: removed commented-out HPATH code Index: mkdep.c =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/mkdep.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mkdep.c 30 Aug 2003 19:20:30 -0000 1.4 +++ mkdep.c 1 Sep 2003 00:18:58 -0000 1.5 @@ -29,7 +29,7 @@ * defaults. Only -I is supported, no attempt is made to handle -idirafter, * -isystem, -I- etc. * - * Aug 2003: stephan beal <st...@wa...> + * Aug 2003: stephan beal <sg...@us...> * - removed HPATH requirement for use in the toc project (toc.sourceforge.net) * * Aug 2003: rusty <bo...@us...> @@ -590,15 +590,6 @@ int len; const char *hpath; - /** - hpath = getenv("HPATH"); - if (!hpath) { - fputs("mkdep: HPATH not set in environment. " - "Don't bypass the top level Makefile.\n", stderr); - return 1; - } - */ - add_path("."); /* for #include "..." */ while (++argv, --argc > 0) { @@ -615,8 +606,6 @@ break; } } - - //add_path(hpath); /* must be last entry, for config files */ while (--argc > 0) { const char * filename = *++argv; |
|
From: <sg...@us...> - 2003-09-01 00:18:17
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv26441 Modified Files: deps.make Log Message: moved toc_make_c_deps into toc_functions.make Index: deps.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/deps.make,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- deps.make 31 Aug 2003 20:23:02 -0000 1.9 +++ deps.make 1 Sep 2003 00:18:14 -0000 1.10 @@ -16,15 +16,6 @@ @echo "Building $@"; cd $(toc_tocdir)/bin; \ $(CC) -o mkdep mkdep.c -# toc_made_c_deps call()able function: -# generates dependencies for c/c++ files. -# $1 = C/C++ sources to process. -# $2 = INCLUDES (e.g., -I. -I/usr/include, with or without the -I). -# $2 defaults to $(INCLUDES). -toc_make_c_deps = inc="$(patsubst %,-I%,$(wildcard $(patsubst -I%,%,$(2))))"; \ - test -z "$$inc" && inc="$(INCLUDES)"; \ - $(DEPSGEN_BIN) $$inc -- $(1) - ifneq (,$(SOURCE_FILES_TO_DEP)) TOC_C_DEPSFILE = .toc.deps.c.make |
|
From: <sg...@us...> - 2003-09-01 00:17:06
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv26313 Modified Files: qmake2make.make Log Message: deps order fiddling to get around a problem when we delete files which make.* need Index: qmake2make.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/qmake2make.make,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- qmake2make.make 1 Sep 2003 00:12:29 -0000 1.16 +++ qmake2make.make 1 Sep 2003 00:17:03 -0000 1.17 @@ -85,8 +85,11 @@ # tie in to the standard targets: install: $(patsubst %,qmake-%-install,$(QMAKES)) uninstall: $(patsubst %,qmake-%-uninstall,$(QMAKES)) -clean: $(patsubst %,qmake-%-clean,$(QMAKES)) clean-. -distclean: $(patsubst %,qmake-%-distclean,$(QMAKES)) distclean-. + +QMAKE_CLEANS = $(patsubst %,qmake-%-clean,$(QMAKES)) +QMAKE_DISTCLEANS = $(patsubst %,qmake-%-distclean,$(QMAKES)) +clean-.: $(QMAKE_CLEANS) +distclean-.: $(QMAKE_DISTCLEANS) qmake: $(patsubst %,qmake-%,$(QMAKES)) DISTCLEAN_FILES += $(QMAKED_MAKEFILES) |
|
From: <sg...@us...> - 2003-09-01 00:12:32
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv25617 Modified Files: qmake2make.make Log Message: changed generated files from CLEAN_FILES to DISTCLEAN_FILES, to avoid a lot of unnecessary rebuilding during clean/distclean Index: qmake2make.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/qmake2make.make,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- qmake2make.make 31 Aug 2003 20:26:10 -0000 1.15 +++ qmake2make.make 1 Sep 2003 00:12:29 -0000 1.16 @@ -85,8 +85,9 @@ # tie in to the standard targets: install: $(patsubst %,qmake-%-install,$(QMAKES)) uninstall: $(patsubst %,qmake-%-uninstall,$(QMAKES)) -clean: $(patsubst %,qmake-%-clean,$(QMAKES)) -distclean: $(patsubst %,qmake-%-distclean,$(QMAKES)) +clean: $(patsubst %,qmake-%-clean,$(QMAKES)) clean-. +distclean: $(patsubst %,qmake-%-distclean,$(QMAKES)) distclean-. qmake: $(patsubst %,qmake-%,$(QMAKES)) -CLEAN_FILES += $(QMAKED_MAKEFILES) +DISTCLEAN_FILES += $(QMAKED_MAKEFILES) +# ^^^ these /should/ be CLEAN_FILES, but that causes a lot of unneeded file rebuilding. |
|
From: <sg...@us...> - 2003-08-31 21:43:47
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv1989/toc/tests Removed Files: qt3.0.x.sh qt3.1.x.sh qt3.2.x.sh qt_31.sh qt_311or2.sh Log Message: removed: obsoleted by qt.sh --- qt3.0.x.sh DELETED --- --- qt3.1.x.sh DELETED --- --- qt3.2.x.sh DELETED --- --- qt_31.sh DELETED --- --- qt_311or2.sh DELETED --- |
|
From: <sg...@us...> - 2003-08-31 21:39:00
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv1114/toc/tests
Added Files:
check_dist_md5s.sh
Log Message:
egg
--- NEW FILE: check_dist_md5s.sh ---
# toc_run_description = checking MD5 sums of your distribution
distname=${PWD##*/}
fn=${1-md5.sums.${distname}}
test ! -f $fn && {
echo "File $fn not found. Skipping md5 check."
return 0;
}
toc_find_in_path md5sum || {
echo "md5sum not found in your PATH. Skipping md5 check! ${TOC_EMOTICON_WARNING}"
return 0
}
md5=${TOC_FIND_RESULT}
tmp=.toc.checkmd5.foo
ret=0
$md5 --check $fn > $tmp || {
grep FAILED $tmp
echo "md5 check failed! Your distribution does not seem to be an unmodified copy of ${PACKAGE_NAME}!"
ret=1
}
rm $tmp
return $ret
|
