Added index for machine(address) and machine(location)

[moira.git] / server / Makefile

diff --git a/server/Makefile b/server/Makefile
index 3391a3e93040955bf0d3012641e798ba6d634e24..0f305c0e011663bbaf6131d6e08d83b478942e4f 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -21,6 +21,7 @@ GLUPOBJS=mr_glue.o qrtn.o queries2.o qsupport.o qsubs.o \
        meinitlst.o mr_sbrk.o ../../rpc/profiled/krb_et.o mr_util.o \
        increment.o cache.o 
 
+INGRESDIR=/usr/ingres
 
 LIBS=../rpc/libmoira.a ../gdb/libgdb.a 
 PLIBS=../../rpc/libmoira_p.a ../../gdb/libgdb_p.a 
@@ -28,7 +29,7 @@ PLIBS=../../rpc/libmoira_p.a ../../gdb/libgdb_p.a
 LLIBS= -L../lib -lzephyr -lkrb -ldes -lcom_err -lm
 PLLIBS= -L../../lib -lzephyr -lkrb -ldes -lcom_err_p -lm
 
-SLIBS= /usr/rtingres/lib/libqlib /usr/rtingres/lib/compatlib 
+SLIBS= ${INGRESDIR}/lib/libqlib ${INGRESDIR}/lib/compatlib 
 
 COPTS= -O
 
@@ -48,12 +49,12 @@ ALL=moirad startmoira libmoiraglue.a # libmoiraglue_p.a
 
 .qc.c: 
        rm -f $*.c
-       /usr/rtingres/bin/eqc -p $*
+       ${INGRESDIR}/bin/eqc -p $*
 
 .dc.c:
        rm -f $*.c
        awk -f ingres.awk < $< > $*.sc
-       /usr/rtingres/bin/esqlc -p $*
+       ${INGRESDIR}/bin/esqlc -p $*
 
 all: ${ALL}
 
@@ -85,8 +86,9 @@ install: moirad startmoira
 
 clean:
        rm -f ${ALL} libmoiraglue_p.a
-       rm -f *.o *~ qrtn.c qsupport.c qoldsup.c increment.c
+       rm -f *.o *~ *.sc qrtn.c qsupport.c qoldsup.c increment.c
        rm -f profiled/*.o
+       rm -f *.err
 
 TAGS:  $(CFILES)
        -etags $(CFILES)
@@ -160,7 +162,8 @@ qrtn.o: ../include/mr_proto.h /usr/include/stdio.h ../include/gdb.h
 qrtn.o: /usr/include/sys/time.h /usr/include/sys/time.h ../include/moira.h
 qrtn.o: ../include/mr_et.h ../include/moira_site.h ../include/krb.h
 qrtn.o: ../include/des.h
-qsupport.o: qsupport.c ../include/mit-copyright.h query.h mr_server.h
+qsupport.o: qsupport.c ../include/mit-copyright.h query.h sql_defs.h 
+qsupport.o: mr_server.h
 qsupport.o: /usr/include/sys/types.h /usr/include/sys/uio.h
 qsupport.o: /usr/include/sys/socket.h /usr/include/netinet/in.h
 qsupport.o: ../include/mr_proto.h /usr/include/stdio.h ../include/gdb.h