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

[moira.git] / update / Imakefile

diff --git a/update/Imakefile b/update/Imakefile
index 2275a9dc44bea063d2b93d18bd615fe3a88a0620..d1127c0747ea0989044a48afe2c1faf4febeadee 100644 (file)
--- a/update/Imakefile
+++ b/update/Imakefile
@@ -9,23 +9,28 @@
 #
 
 SRCS=  auth_001.c checksum.c client.c exec_002.c get_file.c \
-       hostname.c inst_001.c log.c send_file.c smskeyu.c ticket.c \
-       update_server.c xfer_002.c
+       hostname.c inst_001.c log.c send_file.c ticket.c \
+       update_server.c xfer_002.c xfer_003.c config.c update_test.c
 SRCDIR=${SRCTOP}/update
 CODE=${SRCS} Imakefile
 SOBJS= update_server.o auth_001.o inst_001.o xfer_002.o exec_002.o \
-       hostname.o log.o get_file.o checksum.o
-COBJS= client.o ticket.o send_file.o checksum.o hostname.o
+       xfer_003.o log.o get_file.o checksum.o config.o
+COBJS= ticket.o send_file.o checksum.o
+
+#ifdef HAS_VSPRINTF
+DEFINES= -DHAS_VSPRINTF
+#endif
 
 #ifdef SVRBUILD
-all::  update_server moira_update.o
+all::  update_server moira_update.o update_test
 #else
-all::  update_server
+all::  update_server update_test
 #endif
 
 #ifdef SVRBUILD
-moira_update.o: ${COBJS}
-       ${LD} -r -o moira_update.o ${COBJS}
+moira_update.o: ${COBJS} client.o
+       ${LD} -r -o moira_update.o ${COBJS} client.o
 #endif
 
-program(update_server, ${SOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${CLIBS}, ${PROGDIR})
+program(update_server, ${SOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${CLIBS},${ETCDIR})
+test_program(update_test, ${COBJS}, ${CLIBS})