commit fc16ecdf72bdc27684fed33e40cfaad4a7018517
from: Thomas Adam <thomas@xteddy.org>
date: Mon Oct 17 16:48:07 2022 UTC

portable: sort makefile source lines

For all key Makefile.am files in use, sort the files so that they're
more easily identifiable -- especially when adding/removing source
files.

commit - 931185e3857d260051e5d850176a527c5134575c
commit + fc16ecdf72bdc27684fed33e40cfaad4a7018517
blob - 391498ab70e72247f912f425345db12bcf594cfb
blob + c3a6639cb23f279ff3461e866788f54731df4a75
--- Makefile.am
+++ Makefile.am
@@ -55,7 +55,6 @@ regress-cmdline:
 regress-delta:
 	$(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \
 		-o $(top_builddir)/regress/delta/delta_test \
-		$(top_srcdir)/lib/murmurhash2.c \
 		$(top_srcdir)/lib/bloom.c \
 		$(top_srcdir)/lib/buf.c \
 		$(top_srcdir)/lib/date.c \
@@ -65,26 +64,27 @@ regress-delta:
 		$(top_srcdir)/lib/deltify.c \
 		$(top_srcdir)/lib/error.c \
 		$(top_srcdir)/lib/gotconfig.c \
-		$(top_srcdir)/lib/opentemp.c \
-		$(top_srcdir)/lib/path.c \
 		$(top_srcdir)/lib/inflate.c \
 		$(top_srcdir)/lib/lockfile.c \
-		$(top_srcdir)/lib/sha1.c \
+		$(top_srcdir)/lib/murmurhash2.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_open_privsep.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/pack_create_privsep.c \
+		$(top_srcdir)/lib/path.c \
 		$(top_srcdir)/lib/privsep.c \
 		$(top_srcdir)/lib/ratelimit.c \
-		$(top_srcdir)/lib/reference.c \
-		$(top_srcdir)/lib/repository.c \
 		$(top_srcdir)/lib/read_gitconfig_privsep.c \
 		$(top_srcdir)/lib/read_gotconfig_privsep.c \
+		$(top_srcdir)/lib/reference.c \
+		$(top_srcdir)/lib/repository.c \
+		$(top_srcdir)/lib/sha1.c \
 		$(top_srcdir)/lib/sigs.c \
 		$(top_srcdir)/regress/delta/delta_test.c \
 		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
@@ -93,7 +93,6 @@ regress-delta:
 regress-deltify:
 	$(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \
 		-o $(top_builddir)/regress/deltify/deltify_test \
-		$(top_srcdir)/regress/deltify/deltify_test.c \
 		$(top_srcdir)/lib/bloom.c \
 		$(top_srcdir)/lib/buf.c \
 		$(top_srcdir)/lib/date.c \
@@ -119,19 +118,19 @@ regress-deltify:
 		$(top_srcdir)/lib/path.c \
 		$(top_srcdir)/lib/privsep.c \
 		$(top_srcdir)/lib/ratelimit.c \
-		$(top_srcdir)/lib/read_gotconfig_privsep.c \
 		$(top_srcdir)/lib/read_gitconfig_privsep.c \
+		$(top_srcdir)/lib/read_gotconfig_privsep.c \
 		$(top_srcdir)/lib/reference.c \
 		$(top_srcdir)/lib/repository.c \
 		$(top_srcdir)/lib/sha1.c \
 		$(top_srcdir)/lib/sigs.c \
+		$(top_srcdir)/regress/deltify/deltify_test.c \
 		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
 			$(top_builddir)/regress/deltify/deltify_test
 
 regress-fetch:
 	$(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \
 		-o $(top_builddir)/regress/fetch/fetch_test \
-		$(top_srcdir)/regress/fetch/fetch_test.c \
 		$(top_srcdir)/lib/bloom.c \
 		$(top_srcdir)/lib/buf.c \
 		$(top_srcdir)/lib/date.c \
@@ -165,13 +164,13 @@ regress-fetch:
 		$(top_srcdir)/lib/repository.c \
 		$(top_srcdir)/lib/sha1.c \
 		$(top_srcdir)/lib/sigs.c \
+		$(top_srcdir)/regress/fetch/fetch_test.c \
 		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) -lm && \
 			$(top_builddir)/regress/fetch/fetch_test
 
 regress-idset:
 	$(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \
 		-o $(top_builddir)/regress/idset/idset_test \
-		$(top_srcdir)/regress/idset/idset_test.c \
 		$(top_srcdir)/lib/bloom.c \
 		$(top_srcdir)/lib/buf.c \
 		$(top_srcdir)/lib/date.c \
@@ -205,13 +204,13 @@ regress-idset:
 		$(top_srcdir)/lib/repository.c \
 		$(top_srcdir)/lib/sha1.c \
 		$(top_srcdir)/lib/sigs.c \
+		$(top_srcdir)/regress/idset/idset_test.c \
 		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
 			$(top_builddir)/regress/idset/idset_test
 
 regress-path:
 	$(CC) $(DEFS) $(AM_CFLAGS) $(AM_CPPFLAGS) \
 		-o $(top_builddir)/regress/path/path_test \
-		$(top_srcdir)/regress/path/path_test.c \
 		$(top_srcdir)/lib/bloom.c \
 		$(top_srcdir)/lib/buf.c \
 		$(top_srcdir)/lib/date.c \
@@ -245,5 +244,6 @@ regress-path:
 		$(top_srcdir)/lib/repository.c \
 		$(top_srcdir)/lib/sha1.c \
 		$(top_srcdir)/lib/sigs.c \
+		$(top_srcdir)/regress/path/path_test.c \
 		-L$(top_builddir)/compat -lopenbsd-compat $(LIBS) && \
 			$(top_builddir)/regress/path/path_test
blob - cf77cea1d16e614ac5613856153439d9a9837ec6
blob + 900be37b853c4d23226b0bce3b3397fd7371be33
--- got/Makefile.am
+++ got/Makefile.am
@@ -4,57 +4,57 @@ include $(top_builddir)/Makefile.common
 
 got_SOURCES = got.c \
 	$(top_srcdir)/lib/blame.c \
+	$(top_srcdir)/lib/bloom.c \
+	$(top_srcdir)/lib/buf.c \
 	$(top_srcdir)/lib/commit_graph.c \
 	$(top_srcdir)/lib/date.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/dial.c \
 	$(top_srcdir)/lib/diff.c \
+	$(top_srcdir)/lib/diff3.c \
+	$(top_srcdir)/lib/diff_atomize_text.c \
+	$(top_srcdir)/lib/diff_main.c \
+	$(top_srcdir)/lib/diff_myers.c \
+	$(top_srcdir)/lib/diff_output.c \
+	$(top_srcdir)/lib/diff_output_edscript.c \
+	$(top_srcdir)/lib/diff_output_plain.c \
+	$(top_srcdir)/lib/diff_output_unidiff.c \
+	$(top_srcdir)/lib/diff_patience.c \
 	$(top_srcdir)/lib/diffreg.c \
 	$(top_srcdir)/lib/error.c \
+	$(top_srcdir)/lib/fetch.c \
 	$(top_srcdir)/lib/fileindex.c \
+	$(top_srcdir)/lib/gotconfig.c \
+	$(top_srcdir)/lib/inflate.c \
+	$(top_srcdir)/lib/lockfile.c \
+	$(top_srcdir)/lib/murmurhash2.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_open_privsep.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/pack_create_privsep.c \
 	$(top_srcdir)/lib/patch.c \
 	$(top_srcdir)/lib/path.c \
-	$(top_srcdir)/lib/pack.c \
 	$(top_srcdir)/lib/privsep.c \
 	$(top_srcdir)/lib/ratelimit.c \
+	$(top_srcdir)/lib/rcsutil.c \
 	$(top_srcdir)/lib/read_gitconfig_privsep.c \
 	$(top_srcdir)/lib/read_gotconfig_privsep.c \
 	$(top_srcdir)/lib/reference.c \
 	$(top_srcdir)/lib/repository.c \
-	$(top_srcdir)/lib/sha1.c \
-	$(top_srcdir)/lib/worktree.c \
-	$(top_srcdir)/lib/worktree_open.c \
-	$(top_srcdir)/lib/inflate.c \
-	$(top_srcdir)/lib/buf.c \
-	$(top_srcdir)/lib/rcsutil.c \
-	$(top_srcdir)/lib/diff3.c \
-	$(top_srcdir)/lib/lockfile.c \
-	$(top_srcdir)/lib/deflate.c \
-	$(top_srcdir)/lib/object_create.c \
-	$(top_srcdir)/lib/delta_cache.c \
-	$(top_srcdir)/lib/fetch.c \
-	$(top_srcdir)/lib/gotconfig.c \
-	$(top_srcdir)/lib/diff_main.c \
-	$(top_srcdir)/lib/diff_atomize_text.c \
-	$(top_srcdir)/lib/diff_myers.c \
-	$(top_srcdir)/lib/diff_output.c \
-	$(top_srcdir)/lib/diff_output_plain.c \
-	$(top_srcdir)/lib/diff_output_unidiff.c \
-	$(top_srcdir)/lib/diff_output_edscript.c \
-	$(top_srcdir)/lib/diff_patience.c \
 	$(top_srcdir)/lib/send.c \
-	$(top_srcdir)/lib/deltify.c \
-	$(top_srcdir)/lib/pack_create.c \
-	$(top_srcdir)/lib/dial.c \
-	$(top_srcdir)/lib/bloom.c \
-	$(top_srcdir)/lib/murmurhash2.c \
+	$(top_srcdir)/lib/sha1.c \
 	$(top_srcdir)/lib/sigs.c \
-	$(top_srcdir)/lib/pack_create_privsep.c
+	$(top_srcdir)/lib/worktree.c \
+	$(top_srcdir)/lib/worktree_open.c
 
 EXTRA_DIST = $(top_srcdir)/compat/*.[ch] \
 	     $(top_srcdir)/lib/*.[ch] \
blob - f505428791b5acd8309872f9fa16d189906c6c60
blob + b66e12a433c19abd7d0013e4d84db728cefd56f2
--- gotadmin/Makefile.am
+++ gotadmin/Makefile.am
@@ -3,6 +3,9 @@ bin_PROGRAMS = gotadmin
 include $(top_builddir)/Makefile.common
 
 gotadmin_SOURCES = gotadmin.c \
+       $(top_srcdir)/lib/bloom.c \
+       $(top_srcdir)/lib/buf.c \
+       $(top_srcdir)/lib/date.c \
        $(top_srcdir)/lib/deflate.c \
        $(top_srcdir)/lib/delta.c \
        $(top_srcdir)/lib/delta_cache.c \
@@ -11,6 +14,7 @@ gotadmin_SOURCES = gotadmin.c \
        $(top_srcdir)/lib/gotconfig.c \
        $(top_srcdir)/lib/inflate.c \
        $(top_srcdir)/lib/lockfile.c \
+       $(top_srcdir)/lib/murmurhash2.c \
        $(top_srcdir)/lib/object.c \
        $(top_srcdir)/lib/object_cache.c \
        $(top_srcdir)/lib/object_create.c \
@@ -20,6 +24,7 @@ gotadmin_SOURCES = gotadmin.c \
        $(top_srcdir)/lib/opentemp.c \
        $(top_srcdir)/lib/pack.c \
        $(top_srcdir)/lib/pack_create.c \
+       $(top_srcdir)/lib/pack_create_privsep.c \
        $(top_srcdir)/lib/path.c \
        $(top_srcdir)/lib/privsep.c \
        $(top_srcdir)/lib/ratelimit.c \
@@ -29,13 +34,8 @@ gotadmin_SOURCES = gotadmin.c \
        $(top_srcdir)/lib/repository.c \
        $(top_srcdir)/lib/repository_admin.c \
        $(top_srcdir)/lib/sha1.c \
-       $(top_srcdir)/lib/bloom.c \
-       $(top_srcdir)/lib/murmurhash2.c \
-       $(top_srcdir)/lib/worktree_open.c \
-       $(top_srcdir)/lib/date.c \
-       $(top_srcdir)/lib/buf.c \
        $(top_srcdir)/lib/sigs.c \
-       $(top_srcdir)/lib/pack_create_privsep.c
+       $(top_srcdir)/lib/worktree_open.c
 
 gotadmin_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
 EXTRA_DIST = gotadmin.1
blob - a860b264a5fdafcb3e965a046d484f5f74f029a2
blob + c813bc0f64e33b56bf28fb34610cf22e72a9e806
--- gotwebd/Makefile.am
+++ gotwebd/Makefile.am
@@ -3,14 +3,6 @@ sbin_PROGRAMS = gotwebd
 include $(top_builddir)/Makefile.common
 
 gotwebd_SOURCES = config.c \
-		  fcgi.c \
-		  got_operations.c \
-		  gotweb.c \
-		  gotwebd.c \
-		  log.c \
-		  proc.c \
-		  sockets.c \
-		  parse.y \
 		  $(top_srcdir)/lib/blame.c \
 		  $(top_srcdir)/lib/bloom.c \
 		  $(top_srcdir)/lib/buf.c \
@@ -56,7 +48,15 @@ gotwebd_SOURCES = config.c \
 		  $(top_srcdir)/lib/sigs.c \
 		  $(top_srcdir)/lib/utf8.c \
 		  $(top_srcdir)/lib/worktree.c \
-		  $(top_srcdir)/lib/worktree_open.c
+		  $(top_srcdir)/lib/worktree_open.c \
+		  fcgi.c \
+		  got_operations.c \
+		  gotweb.c \
+		  gotwebd.c \
+		  log.c \
+		  parse.y \
+		  proc.c \
+		  sockets.c
 if HOST_LINUX
 nodist_gotwebd_SOURCES = $(top_srcdir)/compat/sockaddr-@PLATFORM@.c
 else