Changes by tytso/probe (not checked in previously):

[moira.git] / Imakefile

diff --git a/Imakefile b/Imakefile
index baf91092c18722538419bec5c77cc5ef71b22674..f98ca26d2f467fb0a5dfb4d3b222f460e49d91a5 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -10,26 +10,42 @@
 
 #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
 
+#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
-       cd util/imake; make
 
 imake::
        cd util/imake; make 
@@ -49,7 +65,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