From 1f0b51d3c338bd235ff16233c27016d1ecadeac7 Mon Sep 17 00:00:00 2001
From: Ryszard Glab <rglab@imid.med.pl>
Date: Fri, 1 Feb 2008 01:31:39 +0000
Subject: [PATCH] 2008-02-01 02:35 UTC+0100 Ryszard Glab <harbour//rglab.pl>   
 * config/lib.cf       * added vpath to search target libraries in
 lib/<arch>/<compiler>

   * config/darwin/global.cf
   * config/hpux/global.cf
   * config/dos/global.cf
   * config/linux/global.cf
   * config/os2/global.cf
   * config/sunos/global.cf
   * config/bsd/global.cf
   * config/w32/global.cf
      * fixed to remove a single library during 'clean'
---
 harbour/ChangeLog               | 14 ++++++++++++++
 harbour/config/bsd/global.cf    |  4 +++-
 harbour/config/darwin/global.cf |  4 +++-
 harbour/config/dos/global.cf    |  4 +++-
 harbour/config/hpux/global.cf   |  4 +++-
 harbour/config/lib.cf           |  1 +
 harbour/config/linux/global.cf  |  4 +++-
 harbour/config/os2/global.cf    |  4 +++-
 harbour/config/sunos/global.cf  |  4 +++-
 harbour/config/w32/global.cf    | 13 +++++++++----
 10 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ab6f50733d..879374086d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-01 02:35 UTC+0100 Ryszard Glab <harbour//rglab.pl>
+   * config/lib.cf
+      * added vpath to search target libraries in lib/<arch>/<compiler>
+      
+   * config/darwin/global.cf
+   * config/hpux/global.cf
+   * config/dos/global.cf
+   * config/linux/global.cf
+   * config/os2/global.cf
+   * config/sunos/global.cf
+   * config/bsd/global.cf
+   * config/w32/global.cf
+      * fixed to remove a single library during 'clean'
+
 2008-01-31 23:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * contrib/gtwvg/tests/demowvg.prg
      ! SVN header added.
diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf
index aacbe63c8b..efca27869e 100644
--- a/harbour/config/bsd/global.cf
+++ b/harbour/config/bsd/global.cf
@@ -52,4 +52,6 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf
index 0a9a017025..e011a12e41 100644
--- a/harbour/config/darwin/global.cf
+++ b/harbour/config/darwin/global.cf
@@ -50,4 +50,6 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index fb4dcc93cd..b1a51a9cbd 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -108,7 +108,9 @@ dirbase::
 
 clean::
 	-$(RD) $(HB_ARCH)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
 
 endif
 endif
diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf
index d0ab989e63..75c7d09695 100644
--- a/harbour/config/hpux/global.cf
+++ b/harbour/config/hpux/global.cf
@@ -50,4 +50,6 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf
index 35ade8cf93..cefb0c78a3 100644
--- a/harbour/config/lib.cf
+++ b/harbour/config/lib.cf
@@ -32,6 +32,7 @@ first:: dirbase descend
 descend :
 	@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME)
 
+vpath $(LIB_NAME) $(LIB_DIR)
 $(LIB_NAME) : $(ALL_OBJS)
 	$(AR_RULE)
 
diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf
index 0a9a017025..e011a12e41 100644
--- a/harbour/config/linux/global.cf
+++ b/harbour/config/linux/global.cf
@@ -50,4 +50,6 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index ac66b325fd..76705c94f4 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -74,6 +74,8 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
 
 endif
diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf
index d0ab989e63..75c7d09695 100644
--- a/harbour/config/sunos/global.cf
+++ b/harbour/config/sunos/global.cf
@@ -50,4 +50,6 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
diff --git a/harbour/config/w32/global.cf b/harbour/config/w32/global.cf
index 9a9d14a0f5..b63b1f2aec 100644
--- a/harbour/config/w32/global.cf
+++ b/harbour/config/w32/global.cf
@@ -73,8 +73,10 @@ dirbase::
 clean::
 	-@$(COMSPEC) /c \
 	'if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)'
+   ifneq ($(LIBNAME),)
 	-@$(COMSPEC) /c \
-	'if exist $(LIB_DIR_DOS) $(RD) $(LIB_DIR_DOS)'
+	'if exist $(LIB_DIR_DOS)\$(LIB_NAME) $(RM) $(LIB_DIR_DOS)\$(LIB_NAME)'
+   endif
 
 else # command.com
 
@@ -85,8 +87,9 @@ dirbase::
 clean::
 	-@for %%f in ($(ARCH_DOS)\*.* *.bak *.obj *.o *.tds) do $(RM) %%f
 	-@for %%d in ($(ARCH_DOS) $(HB_ARCHITECTURE)) do if exist %%d\nul $(RD) %%d
-	-@for %%f in ($(LIB_DIR_DOS)\*.*) do $(RM) %%f
-	-@for %%d in ($(LIB_DIR_DOS) $(LIB_PATH_DOS)) do if exist %%d\nul $(RD) %%d
+   ifneq ($(LIBNAME),)
+	if exist $(LIB_DIR_DOS)\$(LIB_NAME) $(RM) $(LIB_DIR_DOS)\$(LIB_NAME)
+   endif
 
 endif
 
@@ -109,6 +112,8 @@ dirbase::
 
 clean::
 	-$(RD) $(ARCH_DIR)
-	-$(RD) $(LIB_DIR)/
+   ifneq ($(LIBNAME),) 
+	   -$(RM) $(LIB_DIR)/$(LIB_NAME) 
+   endif
 
 endif