Diane Delgado's changes for a fixed table-locking order

[moira.git] / Imakefile

diff --git a/Imakefile b/Imakefile
index 1540055a60bda14d2d696788869ecbc400860f6d..f98ca26d2f467fb0a5dfb4d3b222f460e49d91a5 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -28,6 +28,7 @@ all::
 
 world::
        make ${MFLAGS} clean-imake
+       make ${MFLAGS} imake
        make ${MFLAGS} Makefile
        make ${MFLAGS} Makefiles
        make ${MFLAGS} depend
@@ -36,6 +37,7 @@ world::
 #else /* USELOCALTOOLS */
 
 world::
+       make ${MFLAGS} clean-imake
        make ${MFLAGS} Makefile
        make ${MFLAGS} Makefiles
        make ${MFLAGS} depend
@@ -44,7 +46,6 @@ world::
 
 clean-imake:
        cd util/imake; make clean
-       cd util/imake; make
 
 imake::
        cd util/imake; make 
@@ -64,19 +65,19 @@ install::
        -mkdir ${DESTDIR}${MANDIR}/man8
        -mkdir ./bin
 
-#ifdef USELOCALTOOLS
+#ifndef USELOCALTOOLS
 depend:: makedepend
 #endif
 
-#ifdef USELOCALLIBS
+#ifndef USELOCALLIBS
 depend:: et ss
 #endif
 
 et:
-       cd util/et; make ${MFLAGS} DEPEND="$(DEPEND)" depend; make ${MFLAGS} all
+       cd util/et; make ${MFLAGS} DEPEND="$(BUILDTOP)/../../$(DEPEND)" depend; make ${MFLAGS} all
 
 ss:
-       cd util/ss; make ${MFLAGS} DEPEND="$(DEPEND)" depend; make ${MFLAGS} all
+       cd util/ss; make ${MFLAGS} DEPEND="$(BUILDTOP)/../../$(DEPEND)" depend; make ${MFLAGS} all
 
 makedepend:
        cd util/makedepend; make