apfsprogs: create archive of libraries on build

Instead of linking each library file by itself, assemble an archive with
all the common library code.  Use this to simplify the fsck Makefile,
which no longer needs to relink every single time.

Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com>

.gitignore

@@ -1,6 +1,7 @@
 *.swp
 *.d
 *.o
+*.a
 /apfsck/apfsck
 /mkapfs/mkapfs
 /tags

apfsck/Makefile

@@ -4,7 +4,7 @@ OBJS = $(SRCS:.c=.o)
 DEPS = $(SRCS:.c=.d)
 
 LIBDIR = ../lib
-LIBS = $(LIBDIR)/checksum.o $(LIBDIR)/unicode.o
+LIBRARY = $(LIBDIR)/libapfs.a
 
 BINDIR = ~/bin
 MANDIR = ~/share/man/man8
@@ -13,13 +13,13 @@ SPARSE_VERSION := $(shell sparse --version 2>/dev/null)
 
 override CFLAGS += -Wall -I$(CURDIR)/../include
 
-apfsck: $(OBJS) libraries
+apfsck: $(OBJS) $(LIBRARY)
 	@echo '  Linking...'
-	@gcc $(CFLAGS) -o apfsck $(OBJS) $(LIBS)
+	@gcc $(CFLAGS) -o apfsck $(OBJS) $(LIBRARY)
 	@echo '  Build complete'
 
 # Build the common libraries
-libraries: FORCE
+$(LIBRARY): FORCE
 	@echo '  Building libraries...'
 	@$(MAKE) -C $(LIBDIR) --silent --no-print-directory
 	@echo '  Library build complete'

lib/Makefile

@@ -6,7 +6,9 @@ SPARSE_VERSION := $(shell sparse --version 2>/dev/null)
 
 override CFLAGS += -Wall -I$(CURDIR)/../include
 
-all: $(OBJS)
+libapfs.a: $(OBJS)
+	@echo '  Assembling library archive...'
+	@ar rcs $@ $^
 
 %.o: %.c
 	@echo '  Compiling $<...'
@@ -18,4 +20,4 @@ endif
 -include $(DEPS)
 
 clean:
-	rm -f $(OBJS) $(DEPS)
+	rm -f $(OBJS) $(DEPS) libapfs.a