-setup$(EXEEXT): setup.o citadel_dirs.o
- $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
-
-ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o
- $(CC) ctdlmigrate.o citadel_dirs.o $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
-
-chkpwd$(EXEEXT): chkpwd.o auth.o
- $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
-
-chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o
- $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
+setup$(EXEEXT): utils/setup.o utillib/citadel_dirs.o
+ $(CC) utils/setup.o utillib/citadel_dirs.o \
+ $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)