commit 2b0eee35db2db91d58fc4f76944a384911659ce0
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas.adam@smoothwall.net>
date: Tue Sep 21 20:34:22 2021 UTC

enable gotadmin

Add gotadmin to configure.ac, etc., so it can be built and installed.

OK thomas.adam

commit - 0130fe58c1ded20e2c044839d6254081941a714a
commit + 2b0eee35db2db91d58fc4f76944a384911659ce0
blob - 4feb81eb19b25dc2dbaf0653514c832fb3a674c4
blob + 234e14335c35c5df4eed726311d942e535a03f23
--- .gitignore
+++ .gitignore
@@ -16,6 +16,7 @@ configure
 core
 etc/
 got/got
+gotadmin/gotadmin
 lib/.dirstamp
 libexec/got-fetch-pack/got-fetch-pack
 libexec/got-index-pack/got-index-pack
blob - 8db86d06ba3802afc9a6d4ac16a4875baeb1ab77
blob + d17b743095698c4c96b138c38857275fc972486c
--- Makefile.am
+++ Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = compat libexec got tog
+SUBDIRS = compat libexec got tog gotadmin
 
 EXTRA_DIST = compat/*.[ch] \
 	     got/*.[15] \
blob - 58e9cd224042487a39106bc8aedac7af423fa274
blob + 8d6fb79d27ab1875175458ba8995057718ec92d7
--- configure.ac
+++ configure.ac
@@ -395,6 +395,7 @@ AC_CONFIG_FILES([Makefile
 		 libexec/got-read-tag/Makefile
 		 libexec/got-send-pack/Makefile
 		 got/Makefile
+		 gotadmin/Makefile
 		 tog/Makefile])
 AC_OUTPUT
 
blob - fa31072bce1bf22d8516963a6d472bf2f45cfea1 (mode 644)
blob + /dev/null
--- gotadmin/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-.PATH:${.CURDIR}/../lib
-
-.include "../got-version.mk"
-
-PROG=		gotadmin
-SRCS=		gotadmin.c \
-		deflate.c delta.c delta_cache.c deltify.c error.c gotconfig.c \
-		inflate.c lockfile.c object.c object_cache.c object_create.c \
-		object_idset.c object_parse.c opentemp.c pack.c pack_create.c \
-		path.c privsep.c reference.c repository.c repository_admin.c \
-		sha1.c
-MAN =		${PROG}.1
-
-CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib
-
-.if defined(PROFILE)
-LDADD = -lutil_p -lz_p -lc_p
-.else
-LDADD = -lutil -lz
-.endif
-DPADD = ${LIBZ} ${LIBUTIL}
-
-.if ${GOT_RELEASE} != "Yes"
-NOMAN = Yes
-.endif
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
-	-m ${BINMODE} ${PROG} ${BINDIR}/${PROG}
-
-dist:
-	mkdir ../got-${GOT_VERSION}/${PROG}
-	cp ${SRCS} ${MAN} ../got-${GOT_VERSION}/${PROG}
-
-.include <bsd.prog.mk>
blob - /dev/null
blob + a333f45b012539849f60b8f9088ae8e50f3615b7 (mode 644)
--- /dev/null
+++ gotadmin/Makefile.am
@@ -0,0 +1,40 @@
+bin_PROGRAMS = gotadmin
+
+gotadmin_SOURCES = gotadmin.c \
+       $(top_srcdir)/lib/deflate.c \
+       $(top_srcdir)/lib/delta.c \
+       $(top_srcdir)/lib/delta_cache.c \
+       $(top_srcdir)/lib/deltify.c \
+       $(top_srcdir)/lib/error.c \
+       $(top_srcdir)/lib/gotconfig.c \
+       $(top_srcdir)/lib/inflate.c \
+       $(top_srcdir)/lib/lockfile.c \
+       $(top_srcdir)/lib/object.c \
+       $(top_srcdir)/lib/object_cache.c \
+       $(top_srcdir)/lib/object_create.c \
+       $(top_srcdir)/lib/object_idset.c \
+       $(top_srcdir)/lib/object_parse.c \
+       $(top_srcdir)/lib/opentemp.c \
+       $(top_srcdir)/lib/pack.c \
+       $(top_srcdir)/lib/pack_create.c \
+       $(top_srcdir)/lib/path.c \
+       $(top_srcdir)/lib/privsep.c \
+       $(top_srcdir)/lib/reference.c \
+       $(top_srcdir)/lib/repository.c \
+       $(top_srcdir)/lib/repository_admin.c \
+       $(top_srcdir)/lib/sha1.c
+
+gotadmin_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
+
+man1_MANS = gotadmin.1
+
+AM_CPPFLAGS += -DGOT_VERSION='"@VERSION@"' \
+       -DGOT_VERSION_NUMBER='"@VERSION@"' \
+       -DGOT_LIBEXECDIR="${bindir}" \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/compat \
+       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/include \
+       -I.
+
+LDADD = -L$(top_builddir)/compat -lopenbsd-compat
blob - a6398ccb64350775f2db703c7520234c180aefd1
blob + 2cd34eb41da9f6c9505bd2ead2e8c3442c744f3c
--- gotadmin/gotadmin.c
+++ gotadmin/gotadmin.c
@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
 #include <sys/types.h>
 
 #include <ctype.h>
@@ -29,7 +28,8 @@
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
+
+#include "got_compat.h"
 
 #include "got_version.h"
 #include "got_error.h"
blob - f6a3948b8c4a93bb072778425ca354c152dd54dc
blob + 8ca2cef563de87d804e5cb6ea193dbfab6476f6d
--- lib/repository_admin.c
+++ lib/repository_admin.c
@@ -15,7 +15,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -32,7 +31,6 @@
 #include <string.h>
 #include <limits.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "got_error.h"
 #include "got_cancel.h"