Fix another freeing-memory-we-didn't-malloc bug in AddMachine. This

[moira.git] / server / Imakefile

diff --git a/server/Imakefile b/server/Imakefile
index 432f42dfd7077d705b8636f24c75d068c0722eeb..a2c5b80decb24778fd02d94ae673dcf50b7e2f02 100644 (file)
--- a/server/Imakefile
+++ b/server/Imakefile
@@ -8,45 +8,47 @@
 # Imakefile for server directory.
 #
 
-#ifdef INGRES
-XSRC= mr_sbrk.c meinitlst.c
-XOBJ= mr_sbrk.o meinitlst.o
-#else
-XSRC=
-XOBJ=
-#endif
-
-DEFINES=-DGDSS -I/mit/gdss/include -I.
+DEFINES= -I. $(GDSSINC)
 
 SRCS = startmoira.c mr_main.c mr_sauth.c mr_scall.c \
-       mr_srvdata.c mr_shutdown.c mr_util.c qrtn.c \
-       qsupport.c qsubs.c queries2.c mr_smalloc.c \
-       increment.c cache.c mr_glue.c \
-       mr_server.h query.h qrtn.h $(XSRC)
+       mr_srvdata.c mr_shutdown.c mr_util.c \
+       mr_server.h query.h qrtn.h qrtn.c \
+       qsupport.c qsubs.c queries2.c increment.c \
+       cache.c mr_glue.c qvalidate.c qaccess.c qsetup.c \
+       qfollow.c
 CODE= startmoira.c mr_main.c mr_sauth.c mr_scall.c \
-       mr_srvdata.c mr_shutdown.c mr_util.c qrtn.dc \
-       qsupport.dc qsubs.c queries2.c mr_smalloc.c \
-       increment.dc cache.dc mr_glue.c \
-       Imakefile mr_server.h query.h qrtn.h $(XSRC)
+       mr_srvdata.c mr_shutdown.c mr_util.c \
+       mr_server.h query.h qrtn.h qrtn.pc \
+       qsupport.pc qsubs.c queries2.c increment.pc \
+       cache.pc mr_glue.c qvalidate.pc Imakefile \
+       qaccess.pc qsetup.pc qfollow.pc
 SRVOBJ=mr_main.o mr_sauth.o mr_scall.o mr_srvdata.o mr_shutdown.o \
        mr_util.o qrtn.o queries2.o qsupport.o qsubs.o \
-       mr_smalloc.o increment.o cache.o $(XOBJ)
+       increment.o cache.o qvalidate.o \
+       qaccess.o qsetup.o qfollow.o
 GLUOBJS=mr_glue.o qrtn.o queries2.o qsupport.o qsubs.o \
-       ../lib/mr_et.o mr_srvdata.o mr_smalloc.o \
-       ../lib/krb_et.o mr_util.o increment.o cache.o $(XOBJ)
+       ../lib/mr_et.o mr_sauth.o mr_srvdata.o \
+       ../lib/krb_et.o mr_util.o increment.o cache.o \
+       qvalidate.o qaccess.o qsetup.o qfollow.o
 SRCDIR = $(SRCTOP)/server
 sqlrule()
 
 program(moirad, ${SRVOBJ},${MR_LIBDEP} ${GDB_LIBDEP},\
        -L/usr/athena/lib .././lib/libmoira.a -lzephyr \
-       .././gdb/libmrgdb.a  -lcom_err \
-       /mit/gdss/`machtype`/libgdss.a -lkrb -ldes -lhesiod \
-       ${SQL_LIB}, ${PROGDIR})
-program(startmoira, startmoira.o,,, ${PROGDIR})
+       .././gdb/libmrgdb.a  -lcom_err $(LIBGDSS)\
+       -lkrb -ldes -lhesiod ${SQL_LIB}, ${PROGDIR})
+program(startmoira, startmoira.o,${MR_LIBDEP} ${GDB_LIBDEP},\
+       -L/usr/athena/lib .././lib/libmoira.a -lzephyr \
+       .././gdb/libmrgdb.a -lcom_err -lkrb -ldes -lhesiod,\
+       ${PROGDIR})
 library_obj_rule()
-install_library_target(mrglue,$(GLUOBJS),$(SRCS),)
+install_library_target(mrglue,$(GLUOBJS),$(SRCS))
 
 sqlfile(cache)
 sqlfile(increment)
 sqlfile(qrtn)
 sqlfile(qsupport)
+sqlfile(qvalidate)
+sqlfile(qaccess)
+sqlfile(qsetup)
+sqlfile(qfollow)