Code style cleanup. (No functional changes)

[moira.git] / gen / Imakefile

diff --git a/gen/Imakefile b/gen/Imakefile
index ea40b5e755a6d18f323fb820410271d32887b335..27abca25c1158bb3c95595dab777e4e2032045e4 100644 (file)
--- a/gen/Imakefile
+++ b/gen/Imakefile
@@ -9,68 +9,54 @@
 #
 
 SRCDIR = $(SRCTOP)/gen
-#ifdef GDSS
-SRCS = util.c moddiff.c ca.c passwd.c zephyr.c aliases.c hesiod.c \
-       nfs.c mailhub.c mitdir.c prlogger.c stats.c sis.c pobox.c \
-       letter.c hosts.c report.c networks.c
-OBJS = util.o moddiff.o ca.o passwd.o zephyr.o aliases.o hesiod.o \
-       nfs.o mailhub.o mitdir.o prlogger.o stats.o sis.o pobox.o \
-       letter.o hosts.o report.o networks.o
-CODE = util.c moddiff.dc ca.dc passwd.dc zephyr.dc aliases.dc hesiod.dc \
-       nfs.dc mailhub.dc mitdir.dc prlogger.dc stats.dc sis.dc pobox.dc \
-       letter.dc hosts.dc report.dc networks.dc
+#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
+OBJS = util.o moddiff.o passwd.o hesiod.o \
+       nfs.o mailhub.o sis.o pobox.o \
+       hosts.o network.o warehouse.o
+CODE = util.c moddiff.pc passwd.pc hesiod.pc \
+       nfs.pc mailhub.pc sis.pc pobox.pc \
+       hosts.pc network.pc warehouse.pc
 LIBS =  -L/usr/athena/lib ../lib/libmoira.a -lcom_err -lzephyr \
-       ../server/libmrglue.a /mit/gdss/`machtype`/libgdss.a \
-       -lkrb -ldes -lhesiod ${SQL_LIB}
-DEFINES = -I/mit/gdss/include
-#else /* GDSS */
-SRCS = util.c moddiff.c ca.c passwd.c zephyr.c aliases.c hesiod.c \
-       nfs.c mailhub.c mitdir.c prlogger.c stats.c pobox.c \
-       letter.c hosts.c report.c networks.c
-OBJS = util.o moddiff.o ca.o passwd.o zephyr.o aliases.o hesiod.o \
-       nfs.o mailhub.o mitdir.o prlogger.o stats.o pobox.o \
-       letter.o hosts.o report.o networks.o
-CODE = util.c moddiff.dc ca.dc passwd.dc zephyr.dc aliases.dc hesiod.dc \
-       nfs.dc mailhub.dc mitdir.dc prlogger.dc stats.dc pobox.dc \
-       letter.dc hosts.dc report.dc networks.dc
+       $(LIBGDSS) -lkrb -ldes -lhesiod ${SQL_LIB}
+DEFINES = $(GDSSINC)
+#else /* DO_GDSS */
+SRCS = util.c moddiff.c passwd.c hesiod.c \
+       nfs.c mailhub.c pobox.c \
+       hosts.c network.c
+OBJS = util.o moddiff.o passwd.o hesiod.o \
+       nfs.o mailhub.o pobox.o \
+       hosts.o network.o
+CODE = util.c moddiff.pc passwd.pc hesiod.pc \
+       nfs.pc mailhub.pc pobox.pc \
+       hosts.pc network.pc
 LIBS =  -L/usr/athena/lib ../lib/libmoira.a -lcom_err -lzephyr \
-       ../server/libmrglue.a -lkrb -ldes -lhesiod ${SQL_LIB}
+       -lkrb -ldes -lhesiod ${SQL_LIB}
 DEFINES =
-#endif /* GDSS */
+#endif /* DO_GDSS */
 sqlrule()
 
-program(ca.gen, ca.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(moddiff)
-sqlfile(ca)
 program(passwd.gen, passwd.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
+sqlfile(moddiff)
 sqlfile(passwd)
-program(zephyr.gen, zephyr.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(zephyr)
-program(aliases.gen, aliases.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(aliases)
 program(hesiod.gen, hesiod.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(hesiod)
 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)
-program(mitdir.gen, mitdir.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(mitdir)
-program(prlogger.gen, prlogger.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(prlogger)
-program(stats.gen, stats.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(stats)
-#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)
-program(letter.gen, letter.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(letter)
 program(hosts.gen, hosts.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(hosts)
-program(report.gen, report.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(report);
-program(networks.gen, networks.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
-sqlfile(networks)
+program(network.gen, network.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
+sqlfile(network)
+