X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/455b7baa193a41161564b53fb02c99ab5154444c..9dbe69dd290c15cc3546e3bcc44fe44b723e74c2:/Imakefile

diff --git a/Imakefile b/Imakefile
index cc29edaf..f98ca26d 100644
--- a/Imakefile
+++ b/Imakefile
@@ -18,33 +18,37 @@ SUBDIRS=$(CLIENTDIRS) $(SVRDIRS)
 SUBDIRS=$(CLIENTDIRS)
 #endif
 
+#ifndef USELOCALTOOLS
+all:: et ss
+#else
 all:: 
+#endif
 
 #ifndef USELOCALTOOLS
 
 world::
 	make ${MFLAGS} clean-imake
+	make ${MFLAGS} imake
 	make ${MFLAGS} Makefile
 	make ${MFLAGS} Makefiles
 	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::
+	make ${MFLAGS} clean-imake
 	make ${MFLAGS} Makefile
 	make ${MFLAGS} Makefiles
 	make ${MFLAGS} depend
 	make ${MFLAGS} all
 #endif /* USELOCALTOOLS */
 
+clean-imake:
+	cd util/imake; make clean
+
+imake::
+	cd util/imake; make 
 
 install::
 	-mkdir ${DESTDIR}
@@ -61,13 +65,19 @@ install::
 	-mkdir ${DESTDIR}${MANDIR}/man8
 	-mkdir ./bin
 
-#ifdef USELOCALTOOLS
-depend::
-	cd util/makedepend; make
+#ifndef USELOCALTOOLS
+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
+#ifndef USELOCALLIBS
+depend:: et ss
 #endif
+
+et:
+	cd util/et; make ${MFLAGS} DEPEND="$(BUILDTOP)/../../$(DEPEND)" depend; make ${MFLAGS} all
+
+ss:
+	cd util/ss; make ${MFLAGS} DEPEND="$(BUILDTOP)/../../$(DEPEND)" depend; make ${MFLAGS} all
+
+makedepend:
+	cd util/makedepend; make