Makefile: Use .a over .xa for executable archives

4 files changed, 28 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 3bd5ddd..09071ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,13 @@
 /src/config.h
 /src/*.o
 /src/*.to
-/src/*.xa
+/src/*.a
 /src/*.bin
 /src/*.c.txt
 /src/*.cat
 /doc/*.[0-9]
 /tests/fuzz/*.o
-/tests/fuzz/*.xa
+/tests/fuzz/*.a
 /tests/fuzz/*.bin
 /tests/fuzz/corpus/
 /tests/slurp.o
diff --git a/Makefile b/Makefile
index 61ad077..02b9166 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ LDLIBS       = -lsiphash
 
 
 .SUFFIXES:
-.SUFFIXES: .in .c .o .to .xa .bin .msg .cat .bin-check
+.SUFFIXES: .in .c .o .to .a .bin .msg .cat .bin-check
 
 .in:
 	sed \
@@ -38,7 +38,7 @@ LDLIBS       = -lsiphash
 .c.to:
 	$(CC) $(CFLAGS) -DTEST -o $@ -c $<
 
-.xa.bin:
+.a.bin:
 	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 
@@ -52,17 +52,17 @@ catalogs.cat = $(catalogs.msg:.msg=.cat)
 sources.h   = $(sources.c:.c=.h)
 sources.o   = $(sources.c:.c=.o)
 sources.to  = $(sources.c:.c=.to)
-sources.xa  = $(sources.c:.c=.xa)
+sources.a   = $(sources.c:.c=.a)
 sources.bin = $(sources.c:.c=.bin)
 fuzz.o      = $(fuzz.c:.c=.o)
-fuzz.xa     = $(fuzz.c:.c=.xa)
+fuzz.a      = $(fuzz.c:.c=.a)
 fuzz.bin    = $(fuzz.c:.c=.bin)
 
 archives = \
 	lib$(NAME).a       \
-	$(sources.xa)      \
-	src/main.xa        \
-	$(fuzz.xa)         \
+	$(sources.a)       \
+	src/main.a         \
+	$(fuzz.a)          \
 
 sources = \
 	$(sources.c)       \
@@ -81,16 +81,16 @@ derived-assets = \
 	$(catalogs.cat)    \
 	$(sources.o)       \
 	$(sources.to)      \
-	$(sources.xa)      \
+	$(sources.a)       \
 	$(sources.bin)     \
 	tests/slurp.o      \
 	src/main.o         \
-	src/main.xa        \
+	src/main.a         \
 	src/main.bin       \
 
 side-assets = \
 	$(fuzz.o)          \
-	$(fuzz.xa)         \
+	$(fuzz.a)          \
 	$(fuzz.bin)        \
 	src/logerr.c.txt   \
 	src/catalog.c.txt  \
@@ -103,7 +103,7 @@ all: $(derived-assets)
 
 
 lib$(NAME).a: $(sources.o)
-src/main.xa:  $(sources.o) src/main.o
+src/main.a:   $(sources.o) src/main.o
 $(fuzz.bin): lib$(NAME).a
 $(manpages) src/config.h:   Makefile deps.mk
 $(sources.o) $(sources.to): Makefile deps.mk src/config.h
diff --git a/deps.mk b/deps.mk
index d967fba..fc0bf7f 100644
--- a/deps.mk
+++ b/deps.mk
@@ -15,8 +15,8 @@ fuzz.c = \
 	tests/fuzz/another.c \
 	tests/fuzz/hello.c \
 
-tests/fuzz/another.xa: tests/fuzz/another.o
-tests/fuzz/hello.xa: tests/fuzz/hello.o
+tests/fuzz/another.a: tests/fuzz/another.o
+tests/fuzz/hello.a: tests/fuzz/hello.o
 tests/fuzz/another.bin-check: tests/fuzz/another.bin
 tests/fuzz/hello.bin-check: tests/fuzz/hello.bin
 
@@ -36,12 +36,12 @@ src/logerr.o	src/logerr.to:	src/logerr.h
 src/random.o	src/random.to:	src/random.h
 src/testing.o	src/testing.to:	src/testing.h
 
-src/catalog.xa:	src/catalog.to
-src/i18n.xa:	src/i18n.to
-src/lib.xa:	src/lib.to
-src/logerr.xa:	src/logerr.to
-src/random.xa:	src/random.to
-src/testing.xa:	src/testing.to
+src/catalog.a:	src/catalog.to
+src/i18n.a:	src/i18n.to
+src/lib.a:	src/lib.to
+src/logerr.a:	src/logerr.to
+src/random.a:	src/random.to
+src/testing.a:	src/testing.to
 
 src/catalog.bin-check:	src/catalog.bin
 src/i18n.bin-check:	src/i18n.bin
@@ -58,9 +58,9 @@ src/logerr.o	src/logerr.to: src/testing.h src/../tests/slurp.h
 src/random.o	src/random.to: src/logerr.h src/testing.h
 src/testing.o	src/testing.to:
 
-src/catalog.xa: src/logerr.o src/testing.o src/../tests/slurp.o
-src/i18n.xa: src/logerr.o src/catalog.o
-src/lib.xa:
-src/logerr.xa: src/testing.o src/../tests/slurp.o
-src/random.xa: src/logerr.o src/testing.o
-src/testing.xa:
+src/catalog.a: src/logerr.o src/testing.o src/../tests/slurp.o
+src/i18n.a: src/logerr.o src/catalog.o
+src/lib.a:
+src/logerr.a: src/testing.o src/../tests/slurp.o
+src/random.a: src/logerr.o src/testing.o
+src/testing.a:
diff --git a/mkdeps.sh b/mkdeps.sh
index 440b560..7fb1880 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -20,7 +20,7 @@ echo 'catalogs.msg = $(catalogs.en.msg)'
 printf '\n'
 
 find tests/fuzz/*.c | sort | varlist 'fuzz.c'
-find tests/fuzz/*.c | sort | awk -F. '{ printf "%s.xa: %s.o\n", $1, $1 }'
+find tests/fuzz/*.c | sort | awk -F. '{ printf "%s.a: %s.o\n", $1, $1 }'
 find tests/fuzz/*.c | sort | awk -F. '{ printf "%s.bin-check: %s.bin\n", $1, $1 }'
 printf '\n\n'