X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/38cf96400d9b59997054516a3049c1f2db3f170e..9d319a583aebcd4b0a4927087b9595d36c400898:/Imakefile

diff --git a/Imakefile b/Imakefile
index baf91092..5efcf5ba 100644
--- a/Imakefile
+++ b/Imakefile
@@ -10,26 +10,37 @@
 
 #define have_subdirs
 CODE=Imakefile
-CLIENTDIRS=util gdb rpc clients man mrtest update
-SRVRDIRS=server backup db dbck dcm gen reg_svr incremental regtape
+CLIENTDIRS=util include gdb lib clients man update
+SVRDIRS=server db backup dbck dcm gen reg_svr incremental regtape
 #ifdef SVRBUILD
 SUBDIRS=$(CLIENTDIRS) $(SVRDIRS)
 #else
 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
+#else /* USELOCALTOOLS */
+
+world::
+	make ${MFLAGS} Makefile
+	make ${MFLAGS} Makefiles
+	make ${MFLAGS} depend
+	make ${MFLAGS} all
+#endif /* USELOCALTOOLS */
 
 imake::
 	cd util/imake; make 
@@ -49,7 +60,19 @@ install::
 	-mkdir ${DESTDIR}${MANDIR}/man8
 	-mkdir ./bin
 
-depend::
+#ifndef USELOCALTOOLS
+depend:: makedepend
+#endif
+
+#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
-	cd util/et; make ${MFLAGS} DEPEND=../../$(DEPEND) depend; make ${MFLAGS} all
-	cd util/ss; make ${MFLAGS} DEPEND=../../$(DEPEND) depend; make ${MFLAGS} all