Change #ifdef GDSS to #ifdef DO_GDSS, because GDSS was getting #undef'ed

[moira.git] / gen / Imakefile

diff --git a/gen/Imakefile b/gen/Imakefile
index 7f3a359ca4659333fd8fa6910ba9a3b1ff535889..91bc13c9182665621f785ced05d954937509d376 100644 (file)
--- a/gen/Imakefile
+++ b/gen/Imakefile
@@ -9,7 +9,7 @@
 #
 
 SRCDIR = $(SRCTOP)/gen
-#ifdef GDSS
+#ifdef DO_GDSS
 SRCS = util.c moddiff.c passwd.c hesiod.c \
        nfs.c mailhub.c sis.c pobox.c \
        hosts.c network.c warehouse.c
@@ -22,20 +22,20 @@ CODE = util.c moddiff.pc passwd.pc hesiod.pc \
 LIBS =  -L/usr/athena/lib ../lib/libmoira.a -lcom_err -lzephyr \
        ../server/libmrglue.a $(LIBGDSS) -lkrb -ldes -lhesiod ${SQL_LIB}
 DEFINES = $(GDSSINC)
-#else /* GDSS */
+#else /* DO_GDSS */
 SRCS = util.c moddiff.c passwd.c hesiod.c \
        nfs.c mailhub.c pobox.c \
-       hosts.c network.c warehouse.c
+       hosts.c network.c 
 OBJS = util.o moddiff.o passwd.o hesiod.o \
        nfs.o mailhub.o pobox.o \
-       hosts.o network.o warehouse.o
+       hosts.o network.o 
 CODE = util.c moddiff.pc passwd.pc hesiod.pc \
        nfs.pc mailhub.pc pobox.pc \
-       hosts.pc network.pc warehouse.pc
+       hosts.pc network.pc 
 LIBS =  -L/usr/athena/lib ../lib/libmoira.a -lcom_err -lzephyr \
        ../server/libmrglue.a -lkrb -ldes -lhesiod ${SQL_LIB}
 DEFINES =
-#endif /* GDSS */
+#endif /* DO_GDSS */
 sqlrule()
 
 program(passwd.gen, passwd.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
@@ -47,9 +47,11 @@ program(nfs.gen, nfs.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(nfs)
 program(mailhub.gen, mailhub.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(mailhub)
-#ifdef GDSS
+#ifdef DO_GDSS
 program(sis.gen, sis.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(sis)
+program(warehouse.gen, warehouse.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
+sqlfile(warehouse)
 #endif
 program(pobox.gen, pobox.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(pobox)
@@ -57,6 +59,4 @@ program(hosts.gen, hosts.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(hosts)
 program(network.gen, network.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(network)
-program(warehouse.gen, warehouse.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(warehouse)