[fU-cvs] libfunutil/toc/make cpp_bins.make,1.4,1.5 deps.make,1.7,1.8 dist.make,1.7,1.8 install.make,1.19,1.20

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

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

Modified Files:
	cpp_bins.make deps.make dist.make install.make 
Log Message:
a number of changes from the toc tree.

Index: cpp_bins.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_bins.make,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cpp_bins.make	26 Aug 2003 00:58:54 -0000	1.4
+++ cpp_bins.make	30 Aug 2003 19:20:30 -0000	1.5
@@ -28,7 +28,11 @@
 
 ifneq (,$(BIN_PROGRAMS))
 
+ifeq (1,$(configure_with_CYGWIN))
+CLEAN_FILES += $(wildcard $(addsuffix .exe,$(BIN_PROGRAMS)))
+else
 CLEAN_FILES += $(wildcard $(BIN_PROGRAMS))
+endif
 
 BIN_PROGRAMS_DEPSFILE = .toc.BIN_PROGRAMS.deps
 
@@ -51,7 +55,6 @@
 
 bins-run: $(BIN_PROGRAMS_TARGETS)
 	@LD_LIBRARY_PATH=$${LD_LIBRARY_PATH}:$${PWD}; for i in $(BIN_PROGRAMS); do echo "Running $$i"; ./$$i || exit $$?; done
-
 
 endif
 # ^^^ got $(BIN_PROGRAMS) ???

Index: deps.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/deps.make,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- deps.make	26 Aug 2003 08:29:27 -0000	1.7
+++ deps.make	30 Aug 2003 19:20:30 -0000	1.8
@@ -11,9 +11,11 @@
 DEPS_C_SOURCES_GLOB = *.cpp *.c *.c++ *.C *.cc *.moc
 SOURCE_FILES_TO_DEP = $(sort $(wildcard $(DEPS_C_SOURCES_GLOB)))
 
+TOC_C_DEPS_MAKEFILE = $(toc_makesdir)/deps.make
+
 DEPSGEN_BIN = $(toc_tocdir)/bin/mkdep
-$(DEPSGEN_BIN):
-	cd $(toc_tocdir)/bin; \
+$(DEPSGEN_BIN): $(TOC_C_DEPS_MAKEFILE)
+	@echo "Building $@"; cd $(toc_tocdir)/bin; \
 	$(CC) -o mkdep mkdep.c
 
 # toc_made_c_deps call()able function:
@@ -28,7 +30,6 @@
 ifneq (,$(SOURCE_FILES_TO_DEP))
 
 TOC_C_DEPSFILE = .toc.deps.c.make
-TOC_C_DEPS_MAKEFILE = $(toc_makesdir)/deps.make
 $(TOC_C_DEPSFILE): $(DEPSGEN_BIN) $(SOURCE_FILES_TO_DEP) Makefile $(TOC_C_DEPS_MAKEFILE)
 	@test -n "$(SOURCE_FILES_TO_DEP)" || exit 0; \
 	echo "Generating source file dependencies for $(DEPS_C_SOURCES_GLOB)"; \

Index: dist.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/dist.make,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dist.make	28 Aug 2003 23:23:19 -0000	1.7
+++ dist.make	30 Aug 2003 19:20:30 -0000	1.8
@@ -5,7 +5,7 @@
 # This snippet requires a filesystem-valid $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 # combination
 DIST_FILES_FILE = .toc.distfiles.list
-CLEAN_FILES += $(DIST_FILES_FILE)
+CLEAN_FILES += $(wildcard $(DIST_FILES_FILE))
 
 FORCE:
 
@@ -29,14 +29,14 @@
 
 DIST_NAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 DIST_FILES_TARBALL = $(DIST_NAME).tar
-CLEAN_FILES += $(DIST_FILES_TARBALL)
+CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL))
 dist-tar: $(DIST_FILES_TARBALL)
 $(DIST_FILES_TARBALL): $(DIST_FILES_FILE)
 	@echo "Making dist tarball..."; \
 		tmpfile=.toc.dist.tmp; \
 		echo '' > $$tmpfile; \
 		find . -name $(DIST_FILES_FILE) | xargs cat >> $$tmpfile; \
-		perl -pe "s|$${PWD}/||" $$tmpfile > foo; sort < foo > $$tmpfile; rm foo; \
+		perl -pe "s|$${PWD}/||" $$tmpfile > foo.bar; sort < foo.bar > $$tmpfile; rm foo.bar; \
 		$(TOC_MAKEDIST_BIN) $$tmpfile $@ || exit; \
 		rm $$tmpfile
 
@@ -48,7 +48,7 @@
 configure_dist_use_zip ?= 0
 
 ifeq (1,$(configure_dist_use_gzip))
-CLEAN_FILES += $(DIST_FILES_TARBALL).gz
+CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL).gz)
 dist-compress: dist-tarball-gzip
 dist-gzip: dist dist-tarball-gzip
 dist-tarball-gzip: $(DIST_FILES_TARBALL).gz
@@ -58,7 +58,7 @@
 # ^^^ end gzip
 
 ifeq (1,$(configure_dist_use_bzip))
-CLEAN_FILES += $(DIST_FILES_TARBALL).bz2
+CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL).bz2)
 dist-compress: dist-tarball-bzip
 dist-bzip: dist dist-tarball-bzip
 dist-tarball-bzip: $(DIST_FILES_TARBALL).bz2
@@ -69,7 +69,7 @@
 
 ifeq (1,$(configure_dist_use_zip))
 DIST_TARBALL_ZIP = $(DIST_NAME).zip
-CLEAN_FILES += $(DIST_TARBALL_ZIP)
+CLEAN_FILES += $(wildcard $(DIST_TARBALL_ZIP))
 dist-compress: dist-tarball-zip
 dist-zip: dist dist-tarball-zip
 dist-tarball-zip: $(DIST_TARBALL_ZIP)

Index: install.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- install.make	29 Aug 2003 10:45:23 -0000	1.19
+++ install.make	30 Aug 2003 19:20:30 -0000	1.20
@@ -79,11 +79,12 @@
 			done
 
 # toc_make_install_symlink call()able:
-# works similarly to toc_make_install, but symlinks back to the install source,
+# Works similarly to toc_make_install, but symlinks back to the install source,
 # instead of copying. Arg $3 is ignored.
 # 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:
+# KNOWN TO NOT WORK PROPERLY UNDER CYGWIN: the symlinks point to the wrong place.
 toc_make_install_symlink = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
 			test -d $(2) || mkdir -p $(2) || exit; \
 			for b in $(1) ""; do test -z "$$b" && continue; \
@@ -174,5 +175,6 @@
 
 uninstall: uninstall-. uninstall-subdirs
 
+# implement these to hook in to the start of the install:
 install-.:
 uninstall-.: