From ee511c807bbb15b0231f7aae485c3eb38e8e01bf Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 2 Mar 2021 19:48:05 -0500
Subject: [PATCH] moved utils directory files into the root

---
 citadel/Makefile.in               | 31 ++++++++++++++-----------------
 citadel/{utils => }/chkpw.c       |  0
 citadel/{utils => }/chkpwd.c      |  0
 citadel/{utils => }/citmail.c     |  0
 citadel/{utils => }/ctdlmigrate.c |  0
 citadel/{utils => }/sendcommand.c |  0
 citadel/{utils => }/setup.c       |  0
 7 files changed, 14 insertions(+), 17 deletions(-)
 rename citadel/{utils => }/chkpw.c (100%)
 rename citadel/{utils => }/chkpwd.c (100%)
 rename citadel/{utils => }/citmail.c (100%)
 rename citadel/{utils => }/ctdlmigrate.c (100%)
 rename citadel/{utils => }/sendcommand.c (100%)
 rename citadel/{utils => }/setup.c (100%)

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index c21e3dc6d..d5ec717bc 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -68,8 +68,8 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/citmail.c utils/setup.c utils/chkpw.c \
-	utils/sendcommand.c  utils/ctdlmigrate.c utils/chkpwd.c \
+SOURCES=citmail.c setup.c chkpw.c \
+	sendcommand.c  ctdlmigrate.c chkpwd.c \
 	citadel_dirs.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
 	domain.c serv_extensions.c genstamp.c \
@@ -93,7 +93,6 @@ mkdir-init:
 	@for d in `/bin/ls $(VPATH)/user_modules/`; do \
 		(mkdir -p user_modules/$$d ) ; \
 	done
-	mkdir -p utils
 	mkdir locale
 
 svn_revision.c: ${SOURCES}
@@ -137,28 +136,28 @@ citserver$(EXEEXT): $(SERV_OBJS)
 	echo "CC $<"
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-citmail$(EXEEXT): utils/citmail.o citadel_dirs.o
-	$(CC) utils/citmail.o citadel_dirs.o \
+citmail$(EXEEXT): citmail.o citadel_dirs.o
+	$(CC) citmail.o citadel_dirs.o \
 		$(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
 
 # setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
-setup$(EXEEXT): utils/setup.o citadel_dirs.o
-	$(CC) utils/setup.o citadel_dirs.o \
+setup$(EXEEXT): setup.o citadel_dirs.o
+	$(CC) setup.o citadel_dirs.o \
 		$(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
 
-ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o citadel_dirs.o
-	$(CC) utils/ctdlmigrate.o citadel_dirs.o \
+ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o
+	$(CC) ctdlmigrate.o citadel_dirs.o \
 		$(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
 
-chkpwd$(EXEEXT): utils/chkpwd.o auth.o
-	$(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
+chkpwd$(EXEEXT): chkpwd.o auth.o
+	$(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
 
-chkpw$(EXEEXT): utils/chkpw.o auth.o citadel_dirs.o
-	$(CC) utils/chkpw.o auth.o citadel_dirs.o \
+chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o
+	$(CC) chkpw.o auth.o citadel_dirs.o \
 		$(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
-sendcommand$(EXEEXT): utils/sendcommand.o citadel_dirs.o $(LIBOBJS)
-	$(CC) utils/sendcommand.o citadel_dirs.o \
+sendcommand$(EXEEXT): sendcommand.o citadel_dirs.o $(LIBOBJS)
+	$(CC) sendcommand.o citadel_dirs.o \
 		$(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
@@ -289,7 +288,6 @@ install-exec-new: all
 clean:
 	rm -vfr locale/*
 	rm -vf *.o 
-	rm -vf utils/*.o ;\
 	rm -vf *.o ;\
 	for i in $(srcdir)/modules/* ; do \
 		rm -vf $$i/*.o ;\
@@ -309,7 +307,6 @@ distclean: cleaner
 	find . -name '*~' -o -name '.#*' | xargs rm -vf
 	rm -vf po/Makefile 
 	rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d package-version.txt
-	rm -vf utils/*.d ;
 	for i in $(srcdir)/modules/* ; do \
 		rm -vf $$i/*.d ;\
 	done
diff --git a/citadel/utils/chkpw.c b/citadel/chkpw.c
similarity index 100%
rename from citadel/utils/chkpw.c
rename to citadel/chkpw.c
diff --git a/citadel/utils/chkpwd.c b/citadel/chkpwd.c
similarity index 100%
rename from citadel/utils/chkpwd.c
rename to citadel/chkpwd.c
diff --git a/citadel/utils/citmail.c b/citadel/citmail.c
similarity index 100%
rename from citadel/utils/citmail.c
rename to citadel/citmail.c
diff --git a/citadel/utils/ctdlmigrate.c b/citadel/ctdlmigrate.c
similarity index 100%
rename from citadel/utils/ctdlmigrate.c
rename to citadel/ctdlmigrate.c
diff --git a/citadel/utils/sendcommand.c b/citadel/sendcommand.c
similarity index 100%
rename from citadel/utils/sendcommand.c
rename to citadel/sendcommand.c
diff --git a/citadel/utils/setup.c b/citadel/setup.c
similarity index 100%
rename from citadel/utils/setup.c
rename to citadel/setup.c
-- 
2.30.2