#96287# make use of makedepend more flexible

11 files changed, 34 insertions, 41 deletions

diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index 8e2817bc811d..8d3809bc5f18 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: mh $ $Date: 2001-11-27 10:43:40 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -69,9 +69,8 @@ NO_DEFAULT_STL=TRUE
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # --- Files --------------------------------------------------------
 
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index 0f49d610ad54..61be961844ef 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -1,4 +1,4 @@
-/* $Id: cpp.h,v 1.1 2001-04-19 08:20:22 nf Exp $ */
+/* $Id: cpp.h,v 1.2 2002-01-08 12:07:30 hjs Exp $ */
 
 #define INS         32768   /* input buffer                             */
 #define OBS         8092    /* outbut buffer                            */
@@ -126,7 +126,6 @@ enum errtype
 };
 
 
-// NP
 typedef struct macroValidator
 {
     Nlist *             pMacro;
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 0376c511973c..e69f21e1e455 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: hr $ $Date: 2001-07-02 14:05:46 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -67,10 +67,10 @@ TARGET=cpp
 TARGETTYPE=CUI
 TARGETTHREAD=ST
 NO_DEFAULT_STL=TRUE
-nodep=true
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index 41dae89a9d24..c659642bac0b 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: armin $ $Date: 2001-10-26 14:40:55 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -66,10 +66,10 @@ PRJNAME=soltools
 TARGET=soltools_giparser
 TARGETTYPE=CUI
 NO_SHL_DESCRIPTION=TRUE
-nodep=true
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 .INCLUDE :  use_perl.mk
 
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index 96ae10bf3a38..514b63433a86 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: armin $ $Date: 2001-06-12 07:55:01 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -67,13 +67,11 @@ TARGET=javadep
 TARGETTYPE=CUI
 TARGETTHREAD=MT
 NO_DEFAULT_STL=TRUE
-nodep=true
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # --- Files --------------------------------------------------------
 
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index 872e21da2094..745034edb16d 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: nf $ $Date: 2001-04-11 09:52:26 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -68,7 +68,7 @@ TARGETTYPE=CUI
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index 15b993f334e6..919d80941e5d 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: vg $ $Date: 2001-07-02 14:21:00 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -69,6 +69,7 @@ LIBTARGET=NO
 NO_DEFAULT_STL=TRUE
 nodep=true
 
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 
 dot=.
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 3d71e0047c20..e240db795853 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,11 +1,11 @@
 so  soltools :   stlport NULL
 so	soltools								usr1	-	all	so_usr1 NULL
 so	soltools\inc							get	-	all	so_inc NULL
-so	soltools\ldump							nmake	-	n	so_ldump NULL
+so	soltools\ldump							nmake	-	n	so_ldump so_mkdep NULL
 so	soltools\winunistd						nmake	-	n	so_wunistd NULL
 so	soltools\mkdepend						nmake	-	all	so_mkdep NULL
-so	soltools\checkdll						nmake	-	u	so_chkdl NULL
-so	soltools\cpp							nmake	-	all	so_cpp__ NULL
-so	soltools\javadep						nmake	-	all	so_jvdep NULL
-so	soltools\support						nmake	-	all	so_supp NULL
+so	soltools\checkdll						nmake	-	u	so_chkdl so_mkdep NULL
+so	soltools\cpp							nmake	-	all	so_cpp__ so_mkdep NULL
+so	soltools\javadep						nmake	-	all	so_jvdep so_mkdep NULL
+so	soltools\support						nmake	-	all	so_supp so_mkdep NULL
 so	soltools\giparser						nmake	-	all	so_gip so_supp NULL
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index 9341a24e578c..7aa4f31e2377 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: armin $ $Date: 2001-10-26 14:38:35 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,12 +65,10 @@ PRJ=..
 PRJNAME=soltools
 TARGET=soltools_support
 TARGETTYPE=CUI
-nodep=true
-
-
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
 
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index afa3645fbf24..b76f006ff2a7 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: pluby $ $Date: 2001-04-18 14:48:35 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:07:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,13 +65,10 @@ PRJNAME=soltools
 TARGET=testshl
 TARGETTYPE=CUI
 
-#USE_LDUMP2=TRUE
-#LDUMP2=LDUMP3
-
 # --- Settings -----------------------------------------------------
-.INCLUDE :  svpre.mk
+
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk
index 7c0c1c91408b..4b2e7ed335ff 100644
--- a/soltools/winunistd/makefile.mk
+++ b/soltools/winunistd/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hjs $ $Date: 2001-11-05 16:33:52 $
+#   last change: $Author: hjs $ $Date: 2002-01-08 12:06:02 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -68,6 +68,7 @@ TARGETTYPE=CUI
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------