From 534bd970a6058212ec10c8a87d5a7697cf31bcb3 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Thu, 14 Nov 2019 20:44:18 +0100 Subject: [PATCH] Improving Makefile. --- Makefile | 40 +++++++++++++++++----------------------- project.zsh | 2 +- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index df5f962..1f23ff5 100644 --- a/Makefile +++ b/Makefile @@ -7,12 +7,12 @@ LIBDIR := $(PREFIX)/lib SHAREDIR := $(PREFIX)/share INCLUDEDIR := $(PREFIX)/include MANDIR := $(SHAREDIR)/man - -CC := cc -AR := ar -RANLIB := ranlib CFLAGS := -Wall -Wextra -g -LDFLAGS := +CC := cc +CXX := c++ +LD := ${CC} +CXXFLAGS := +LDFLAGS := Q := @ @@ -40,7 +40,7 @@ src/ipc.h.uninstall: $(Q)rm -f '$(DESTDIR)$(INCLUDEDIR)/ipc.h' man/libipc.7: man/libipc.7.scd man - @echo ' MAN > man/libipc.7' + @echo ' MAN > man/libipc.7' $(Q)scdoc < 'man/libipc.7.scd' > 'man/libipc.7' @@ -65,11 +65,11 @@ libipc.so.install: libipc.so @echo ' IN > $(LIBDIR)/libipc.so.0.4.0' $(Q)mkdir -p '$(DESTDIR)$(LIBDIR)' $(Q)install -m0755 libipc.so $(DESTDIR)$(LIBDIR)/libipc.so.0.4.0 - @echo ' LN > $(LIBDIR)/libipc.so.0.4' + @echo ' LN > $(LIBDIR)/libipc.so.0.4' $(Q)ln -sf '$(LIBDIR)/libipc.so.0.4.0' '$(DESTDIR)/$(LIBDIR)/libipc.so.0.4' - @echo ' LN > $(LIBDIR)/libipc.so.0' + @echo ' LN > $(LIBDIR)/libipc.so.0' $(Q)ln -sf '$(LIBDIR)/libipc.so.0.4.0' '$(DESTDIR)/$(LIBDIR)/libipc.so.0' - @echo ' LN > $(LIBDIR)/libipc.so' + @echo ' LN > $(LIBDIR)/libipc.so' $(Q)ln -sf '$(LIBDIR)/libipc.so.0.4.0' '$(DESTDIR)/$(LIBDIR)/libipc.so' libipc.so.clean: @@ -209,25 +209,17 @@ $(DESTDIR)$(INCLUDEDIR): $(DESTDIR)$(MANDIR): @echo ' DIR > $(MANDIR)' $(Q)mkdir -p $(DESTDIR)$(MANDIR) -install: subdirs.install libipc.install src/ipc.h.install man/libipc.7.install libipc.so.install libipc.a.install src/communication.o.install src/error.o.install src/logger.o.install src/message.o.install src/network.o.install src/usocket.o.install src/utils.o.install src/communication.o.install src/error.o.install src/logger.o.install src/message.o.install src/network.o.install src/usocket.o.install src/utils.o.install +install: libipc.install src/ipc.h.install man/libipc.7.install libipc.so.install libipc.a.install src/communication.o.install src/error.o.install src/logger.o.install src/message.o.install src/network.o.install src/usocket.o.install src/utils.o.install src/communication.o.install src/error.o.install src/logger.o.install src/message.o.install src/network.o.install src/usocket.o.install src/utils.o.install @: -subdirs.install: - -uninstall: subdirs.uninstall libipc.uninstall src/ipc.h.uninstall man/libipc.7.uninstall libipc.so.uninstall libipc.a.uninstall src/communication.o.uninstall src/error.o.uninstall src/logger.o.uninstall src/message.o.uninstall src/network.o.uninstall src/usocket.o.uninstall src/utils.o.uninstall src/communication.o.uninstall src/error.o.uninstall src/logger.o.uninstall src/message.o.uninstall src/network.o.uninstall src/usocket.o.uninstall src/utils.o.uninstall +uninstall: libipc.uninstall src/ipc.h.uninstall man/libipc.7.uninstall libipc.so.uninstall libipc.a.uninstall src/communication.o.uninstall src/error.o.uninstall src/logger.o.uninstall src/message.o.uninstall src/network.o.uninstall src/usocket.o.uninstall src/utils.o.uninstall src/communication.o.uninstall src/error.o.uninstall src/logger.o.uninstall src/message.o.uninstall src/network.o.uninstall src/usocket.o.uninstall src/utils.o.uninstall @: -subdirs.uninstall: - -test: all subdirs subdirs.test +test: all @: -subdirs.test: - clean: libipc.clean src/ipc.h.clean man/libipc.7.clean libipc.so.clean libipc.a.clean src/communication.o.clean src/error.o.clean src/logger.o.clean src/message.o.clean src/network.o.clean src/usocket.o.clean src/utils.o.clean src/communication.o.clean src/error.o.clean src/logger.o.clean src/message.o.clean src/network.o.clean src/usocket.o.clean src/utils.o.clean - distclean: clean - dist: dist-gz dist-xz dist-bz2 $(Q)rm -- $(PACKAGE)-$(VERSION) @@ -307,10 +299,12 @@ help: @echo ' - uninstall  Deinstalls the project.' @echo '' @echo 'CLI-modifiable variables:' - @echo ' - CC  ${CC}' @echo ' - CFLAGS  ${CFLAGS}' + @echo ' - CC  ${CC}' + @echo ' - CXX  ${CXX}' + @echo ' - LD  ${LD}' + @echo ' - CXXFLAGS  ${CXXFLAGS}' @echo ' - LDFLAGS  ${LDFLAGS}' - @echo ' - DESTDIR  ${DESTDIR}' @echo ' - PREFIX  ${PREFIX}' @echo ' - BINDIR  ${BINDIR}' @echo ' - LIBDIR  ${LIBDIR}' @@ -329,5 +323,5 @@ help: @echo '' @echo 'Rebuild the Makefile with:' @echo ' zsh ./build.zsh -c' -.PHONY: all subdirs clean distclean dist install uninstall help +.PHONY: all clean distclean dist install uninstall help diff --git a/project.zsh b/project.zsh index 406f707..1209a51 100644 --- a/project.zsh +++ b/project.zsh @@ -2,7 +2,7 @@ package=ipc version=0.4.0 -CFLAGS="-Wall -Wextra -g" +variables+=(CFLAGS "-Wall -Wextra -g") targets=(libipc src/ipc.h man/libipc.7)