From: mar <mar>
Date: Tue, 19 Oct 1993 11:40:25 +0000 (+0000)
Subject: clean up building of local tools
X-Git-Tag: release77~130
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/30b805f1faac46df1aca5f12bdbdb4e22b21a33d

clean up building of local tools
---

diff --git a/Imakefile b/Imakefile
index cc29edaf..1540055a 100644
--- 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