[toc-cvstree] SF.net SVN: toc: [111] make-book/trunk/code/ShakeNMake/shake-n-make.make

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

Revision: 111
          http://toc.svn.sourceforge.net/toc/?rev=111&view=rev
Author:   sgbeal
Date:     2008-01-11 12:23:23 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
minor fixes and touches-up

Modified Paths:
--------------
    make-book/trunk/code/ShakeNMake/shake-n-make.make

Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make	2008-01-04 18:47:20 UTC (rev 110)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make	2008-01-11 20:23:23 UTC (rev 111)
@@ -101,7 +101,7 @@
 # Building a shared library:
 #
 #   myDLL.DLL.OBJECTS = foo.o bar.o
-#   myDLL.LDFLAGS = -L/a/lib/path -lmylib
+#   myDLL.DLL.LDFLAGS = -L/a/lib/path -lmylib
 #   $(call ShakeNMake.CALL.RULES.DLLS,myDLL)
 #
 # Like CALL.RULES.BINS, you may pass an arbitrary number of DLL names to
@@ -196,16 +196,16 @@
 ifneq (,$(COMSPEC))
 $(warning Setting ShakeNMake.SMELLS.LIKE.WINDOWS to 1)
 ShakeNMake.SMELLS.LIKE.WINDOWS := 1
-ShakeNMake.EXTENSIONS.DLL = .DLL# maintenance reminder: this must stay upper-case!
-ShakeNMake.EXTENSIONS.EXE = .EXE# maintenance reminder: this must stay upper-case!
+ShakeNMake.EXTENSIONS.DLL := .DLL# maintenance reminder: this must stay upper-case!
+ShakeNMake.EXTENSIONS.EXE := .EXE# maintenance reminder: this must stay upper-case!
 else
 ShakeNMake.SMELLS.LIKE.WINDOWS := 0
-ShakeNMake.EXTENSIONS.DLL = .so
-ShakeNMake.EXTENSIONS.EXE =# no whitespace, please
+ShakeNMake.EXTENSIONS.DLL := .so
+ShakeNMake.EXTENSIONS.EXE :=# no whitespace, please
 endif
 
 
-ShakeNMake.MAKEFILE = shake-n-make.make
+ShakeNMake.MAKEFILE := shake-n-make.make
 $(ShakeNMake.MAKEFILE):# avoid breaking some deps checks if someone renames this file (been there, done that)
 
 ########################################################################
@@ -224,7 +224,7 @@
 # auto-add the makefiles to DIST_FILES, filtering out any which start
 # with a dot because we use such files for temp/volitile files which
 # contain Make rules (C/C++ deps, for example).
-PACKAGE.MAKEFILE = $(firstword $(MAKEFILE_LIST))# normally either Makefile or GNUmakefile
+PACKAGE.MAKEFILE := $(firstword $(MAKEFILE_LIST))# normally either Makefile or GNUmakefile
 PACKAGE.DIST_FILES += $(filter-out .%,$(MAKEFILE_LIST))
 
 
@@ -327,8 +327,10 @@
 ShakeNMake.CALL.UNINSTALL = { \
 	test -d $(1) || exit 0; \
 	for x in $(2); do \
-		echo -e "\t<-- " $(1)/$$x; \
-		rm -f $(1)/$$x || exit; \
+		f=$(1)/$$x; \
+		echo -e "\t<-- " $$f; \
+		if [ -d $$f ]; then rm -r $$f; else \
+		rm -f $$f || exit; fi; \
 	done; \
 	}; \
 	rmdir $(1) 2>/dev/null || true;
@@ -482,7 +484,7 @@
 # Also defines the var $(1).DLL, which expands to the filename of the DLL,
 # (normally $(1)$(ShakeNMake.EXTENSIONS.DLL)).
 define ShakeNMake.EVAL.RULES.DLL
-$(1).DLL = $(1)$(ShakeNMake.EXTENSIONS.DLL)
+$(1).DLL ?= $(1)$(ShakeNMake.EXTENSIONS.DLL)
 ifneq (.DLL,$(ShakeNMake.EXTENSIONS.DLL))
 $(1).DLL: $$($(1).DLL)
 endif
@@ -607,7 +609,7 @@
 ##################################################
 PACKAGE.DIST_FILES += $(ShakeNMake.DOXYGEN.DOXYFILE_TEMPLATE) $(ShakeNMake.DOXYGEN.INDEX)
 
-ShakeNMake.DOXYGEN.INCLUDE_DIRS = .
+ShakeNMake.DOXYGEN.INCLUDE_DIRS += .
 
 ShakeNMake.DOXYGEN.OUTPUT_DIR = $(PACKAGE.NAME)-$(PACKAGE.VERSION)-doxygen
 
@@ -642,8 +644,8 @@
 CLEAN_FILES += Doxyfile $(ShakeNMake.DOXYGEN.OUTPUT_DIR) latex
 
 
-INSTALL_DOXYGEN = $(ShakeNMake.DOXYGEN.OUTPUT_DIR)
-INSTALL_DOXYGEN_DEST = $(prefix)/share/doc/$(PACKAGE.NAME)
+INSTALL.DOXYGEN := $(ShakeNMake.DOXYGEN.OUTPUT_DIR)
+INSTALL.DOXYGEN.DEST ?= $(prefix)/share/doc/$(PACKAGE.NAME)
 install: doxygen
 $(call ShakeNMake.CALL.RULES.INSTALL,DOXYGEN)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.