cake
/
libg1m
Archived
1
0
Fork 0

Changed the way configuration is installed

This commit is contained in:
Thomas Touhey 2016-12-20 21:15:14 +01:00
parent df1a8de797
commit b22f828046
3 changed files with 9 additions and 31 deletions

1
.gitignore vendored
View File

@ -3,4 +3,3 @@
/libg1m.so*
/libg1m.dll
/man
/bin

View File

@ -9,14 +9,14 @@ include Makefile.msg
# General targets #
#******************************************************************************#
# Build everything.
all: all-lib all-doc all-cfgtool
all: all-lib all-doc
# Mostly clean everything. (remove everything but the end results)
mostlyclean: mostlyclean-lib mostlyclean-doc
mclean: mostlyclean
# Clean everything.
clean: clean-lib clean-doc clean-cfgtool
clean: clean-lib clean-doc
fclean: clean
# Clean everything, and configuration.
@ -148,40 +148,22 @@ uninstall-lib: $(CHECKCFG)
#******************************************************************************#
# Configuration tool-related #
#******************************************************************************#
# Make it all!
all-cfgtool: $(CHECKCFG) $(BINDIR)/lib$(NAME)-config
# Make the directory.
$(BINDIR):
$(call bcmd,md,$@,$(MD) $@)
# Build it.
$(BINDIR)/lib$(NAME)-config:| $(BINDIR)
$(call bcmd,writecfg,lib$(NAME),\
tools/write-config --name=lib$(NAME) --version=$(VERSION) \
--author-name="$(AUTHOR)" --author-mail="$(AUTHOR_MAIL)" \
--incdir="$(IINCDIR)" --libdir="$(IBINDIR)" >$@ && chmod 755 $@)
# Clean it.
clean-cfgtool:
$(call rmsg,Removing configuration tool.)
$(call qcmd,$(RM) -r $(BINDIR))
# Remake it.
re-cfgtool: clean-cfgtool all-cfgtool
# Install it.
install-cfgtool: $(CHECKCFG) all-cfgtool
install-cfgtool: $(CHECKCFG)
$(call imsg,Installing the configuration tool.)
$(call qcmd,$(INST) -m 755 -d "$(IBINDIR)")
$(call qcmd,$(INST) -m 755 -t "$(IBINDIR)" $(BINDIR)/lib$(NAME)-config)
$(call bcmd,write-cfg-tool,lib$(NAME),\
tools/write-config --name=lib$(NAME) --version=$(VERSION) \
--author-name="$(AUTHOR)" --author-mail="$(AUTHOR_MAIL)" \
--incdir="$(IINCDIR)" --libdir="$(IBINDIR)" \
>"$(IBINDIR)/lib$(NAME)-config" \
&& chmod 755 "$(IBINDIR)/lib$(NAME)-config")
# Uninstall it
uninstall-cfgtool: $(CHECKCFG)
$(call rmsg,Uninstalling configuration tool.)
$(call qcmd,$(RM) "$(IBINDIR)/lib$(NAME)-config"
.PHONY: all-cfgtool clean-cfgtool re-cfgtool
.PHONY: install-cfgtool uninstall-cfgtool
#******************************************************************************#
# Documentation-related #

View File

@ -48,9 +48,6 @@
# Manpages directory - where the manpages will be put.
MANDIR := ./man
# Executables directory - where the executables will be put.
BINDIR := ./bin
#******************************************************************************#
# Object names #
#******************************************************************************#