clean up building of local tools

diff --git a/Imakefile b/Imakefile
index cc29edaff58e64a49468adf4d88d1ba68eae2e24..1540055a60bda14d2d696788869ecbc400860f6d 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -18,7 +18,11 @@ SUBDIRS=$(CLIENTDIRS) $(SVRDIRS)
 SUBDIRS=$(CLIENTDIRS)
 #endif
 
+#ifndef USELOCALTOOLS
+all:: et ss
+#else
 all:: 
+#endif
 
 #ifndef USELOCALTOOLS
 
@@ -29,13 +33,6 @@ world::
        make ${MFLAGS} depend
        make ${MFLAGS} all
 
-clean-imake:
-       cd util/imake; make clean
-       cd util/imake; make
-
-imake::
-       cd util/imake; make 
-
 #else /* USELOCALTOOLS */
 
 world::
@@ -45,6 +42,12 @@ world::
        make ${MFLAGS} all
 #endif /* USELOCALTOOLS */
 
+clean-imake:
+       cd util/imake; make clean
+       cd util/imake; make
+
+imake::
+       cd util/imake; make 
 
 install::
        -mkdir ${DESTDIR}
@@ -62,12 +65,18 @@ install::
        -mkdir ./bin
 
 #ifdef USELOCALTOOLS
-depend::
-       cd util/makedepend; make
+depend:: makedepend
 #endif
 
 #ifdef USELOCALLIBS
-depend::
-       cd util/et; make ${MFLAGS} DEPEND=../../$(DEPEND) depend; make ${MFLAGS} all
-       cd util/ss; make ${MFLAGS} DEPEND=../../$(DEPEND) depend; make ${MFLAGS} all
+depend:: et ss
 #endif
+
+et:
+       cd util/et; make ${MFLAGS} DEPEND="$(DEPEND)" depend; make ${MFLAGS} all
+
+ss:
+       cd util/ss; make ${MFLAGS} DEPEND="$(DEPEND)" depend; make ${MFLAGS} all
+
+makedepend:
+       cd util/makedepend; make