makefile: force link with fmt static library

Author: Toni500github

Makefile

@@ -62,20 +62,20 @@ OBJ_CPP 	 = $(SRC_CPP:.cpp=.o)
 OBJ_CC  	 = $(SRC_CC:.cc=.o)
 OBJ		 = $(OBJ_CPP) $(OBJ_CC)
 HEADERS		 = config.hpp common.hpp core-modules.hh cufetch.hh
-LDFLAGS   	+= -L./$(BUILDDIR) -lcufetch -lfmt -ldl
+LDFLAGS   	+= -Wl,-Bstatic $(BUILDDIR)/libfmt.a -Wl,-Bdynamic -lcufetch -ldl
 CXXFLAGS  	?= -mtune=generic -march=native
 CXXFLAGS        += -fvisibility-inlines-hidden -fvisibility=hidden -Iinclude -std=c++20 $(VARS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DICONPREFIX=\"$(ICONPREFIX)\"
 
-all: genver libcufetch fmt toml json $(TARGET)
+all: genver fmt toml json libcufetch $(TARGET)
 
 libcufetch:
 ifeq ($(wildcard $(BUILDDIR)/libcufetch.so),)
-	mkdir -p $(BUILDDIR)
 	make -C libcufetch BUILDDIR=$(BUILDDIR)
 endif
 
 fmt:
 ifeq ($(wildcard $(BUILDDIR)/libfmt.a),)
+	mkdir -p $(BUILDDIR)
 	make -C src/libs/fmt BUILDDIR=$(BUILDDIR)
 endif
 
@@ -94,10 +94,10 @@ ifeq ($(wildcard include/version.h),)
 	./scripts/generateVersion.sh
 endif
 
-$(TARGET): genver fmt toml libcufetch json $(OBJ)
+$(TARGET): genver fmt toml json libcufetch $(OBJ)
 	mkdir -p $(BUILDDIR)
 	sh ./scripts/generateVersion.sh
-	$(CXX) $(OBJ) $(BUILDDIR)/*.o -o $(BUILDDIR)/$(TARGET) $(LDFLAGS)
+	$(CXX) -o $(BUILDDIR)/$(TARGET) $(OBJ) $(BUILDDIR)/*.o $(LDFLAGS)
 	cd $(BUILDDIR)/ && ln -sf $(TARGET) cufetch
 
 locale:
@@ -121,9 +121,9 @@ clean:
 
 distclean:
 	rm -rf $(BUILDDIR) ./tests/$(BUILDDIR) $(OBJ)
-	find . -type f -name "*.tar.gz" -exec rm -rf "{}" \;
-	find . -type f -name "*.o" -exec rm -rf "{}" \;
-	find . -type f -name "*.a" -exec rm -rf "{}" \;
+	find . -type f -name "*.tar.gz" -delete
+	find . -type f -name "*.o" -delete
+	find . -type f -name "*.a" -delete
 
 install: install-common $(TARGET)
 	install $(BUILDDIR)/$(TARGET) -Dm 755 -v $(DESTDIR)$(PREFIX)/bin/$(TARGET)

libcufetch/Makefile

@@ -3,14 +3,17 @@ CXX_INCLUDES 	= -I../include
 CXX_FLAGS 	= -shared -fPIC
 SRC		= $(wildcard *.cc)
 OBJ		= $(SRC:.cc=.o)
+FMT_STATIC	= ../$(BUILDDIR)/libfmt.a
 
 all: libcufetch
 
 %.o: %.cc
 	$(CXX) $(CXX_INCLUDES) $(CXX_FLAGS) -c -o $@ $<
 
-libcufetch: $(OBJ)
-	$(CXX) $(OBJ) $(CXX_INCLUDES) $(CXX_FLAGS) -o libcufetch.so -L../$(BUILDDIR)/ -lfmt
+libcufetch: $(OBJ) $(FMT_STATIC)
+	$(CXX) $(CXX_FLAGS) $(OBJ) $(CXX_INCLUDES) \
+		-Wl,-Bstatic $(FMT_STATIC) -Wl,-Bdynamic \
+		-o libcufetch.so
 	mv -f libcufetch.so ../$(BUILDDIR)/$@.so
 
 clean:

src/libs/fmt/Makefile

@@ -5,7 +5,7 @@
 CXX		?= g++
 # CXX_DEFINES 	= -DFMT_LIB_EXPORT -Dfmt_EXPORTS
 CXX_INCLUDES 	= -I../../../include
-CXX_FLAGS 	= -O3 -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden
+CXX_FLAGS 	= -O3 -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden -fPIC
 
 all: fmt
 
@@ -15,7 +15,6 @@ fmt: format.cc os.cc
 	ar qc libfmt.a os.cc.o format.cc.o
 	ranlib libfmt.a
 	mv -f libfmt.a ../../../$(BUILDDIR)/libfmt.a
-	# $(CXX) -fPIC -O3 -DNDEBUG -shared -Wl,-soname,libfmt.so.10 -o libfmt.so format.cc.o os.cc.o
 
 clean:
 	rm -f *.o *.so *.a ../../../$(BUILDDIR)/fmt/.*a