From f39783675d488218ce7dde93ac471444db87de4c Mon Sep 17 00:00:00 2001 From: Liam Waldron Date: Fri, 11 Apr 2025 14:46:06 -0400 Subject: [PATCH] initialize branch which will be included in glacier source tree --- Makefile | 8 ++++---- config.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8e38ac2..44a4797 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,10 @@ test: deprecate cp etc/example.cfg ./glacier.cfg lib: $(SDIR)/libglacier.c - mkdir build - mkdir build/lib + mkdir -p $(BDIR) + mkdir -p $(BDIR)/lib $(CC) $(SDIR)/libglacier.c -c $(LIBFLAGS) -o $(BDIR)/lib/libglacier.o - $(AR) -rc $(BDIR)/lib/libglacier.a build/lib/libglacier.o + $(AR) -rc $(BDIR)/lib/libglacier.a $(BDIR)/lib/libglacier.o check: lib $(BDIR) $(TDIR)/unit-tests.c $(CC) tests/unit-tests.c -o tests/test-suite -lcunit -Wall -Wextra build/lib/libglacier.a $(LIBFLAGS) @@ -43,7 +43,7 @@ install_lib: $(BDIR)/lib/libglacier.a @echo "[INFO]" @echo "[INFO] Installing library to PREFIX/lib..." @echo "[INFO]" - install $(BDIR)/lib/libglacier.a $(PREFIX)/lib + install $(BDIR)/lib/libglacier.a $(PREFIX)/lib -m755 install_head: $(IDIR)/config.h $(IDIR)/data.h $(IDIR)/log.h $(IDIR)/pkgops.h $(IDIR)/runtime.h $(IDIR)/security.h @echo "[INFO]" diff --git a/config.mk b/config.mk index a459b40..f838d01 100644 --- a/config.mk +++ b/config.mk @@ -5,6 +5,6 @@ CC = /bin/gcc AR = /bin/ar -LIBFLAGS = -lconfig -lcrypto +LIBFLAGS = -L/home/arco/Projects/glacier/build/lib/libconfig-static/lib/libconfig.a -L/openssl-static/lib64 -lcrypto -L/libconfig-static/lib -lconfig -PREFIX = /usr +PREFIX=/home/arco/Projects/glacier/./build/lib/libglacier