libmpm

morphux C package management library
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/libmpm

commit 2faac77d90d210cdfa7370b494a25929ccf9ba66
parent 1245be5fdd02756d1f203c7d2061b8f8480e3091
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Fri, 10 Feb 2017 15:29:36 +0100

Add(Libconfuse): Add libconfuse to the library archive

Diffstat:
M.gitmodules | 3+++
M.travis.yml | 2+-
MMakefile | 9++++++---
Alib/libconfuse | 1+
4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -7,3 +7,6 @@ [submodule "lib/json-c"] path = lib/json-c url = https://github.com/json-c/json-c.git +[submodule "lib/libconfuse"] + path = lib/libconfuse + url = https://github.com/martinh/libconfuse.git diff --git a/.travis.yml b/.travis.yml @@ -3,7 +3,7 @@ compiler: gcc before_install: - sudo apt-get -qq update - - sudo apt-get install -y valgrind lcov + - sudo apt-get install -y valgrind lcov autopoint flex - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- script: diff --git a/Makefile b/Makefile @@ -35,7 +35,8 @@ SFLAGS = -Wall -Wextra -Werror -Wno-unused-result # Library Flags LFLAGS = -L lib/libmorphux -lmorphux \ -L ./lib/curl/lib/.libs/ -lcurl \ - -L ./lib/json-c/.libs -ljson-c + -L ./lib/json-c/.libs -ljson-c \ + -L ./lib/libconfuse/.libs -lconfuse CFLAGS = $(SFLAGS) $(IFLAGS) $(OFLAGS) $(LFLAGS) ARFLAGS = -cq @@ -49,6 +50,7 @@ OBJ_DIR = objs/ L_MORPHUX = ../lib/libmorphux/libmorphux.a L_CURL = ../lib/curl/lib/.libs/libcurl.a L_JSON = ../lib/json-c/.libs/libjson-c.a +L_CONF = ../lib/libconfuse/src/.libs/libconfuse.a all: $(NAME) @@ -60,8 +62,8 @@ $(NAME): $(SQLITE) $(OBJS) @if [ ! -d "$(OBJ_DIR)" ]; then mkdir $(OBJ_DIR); fi @cp $(OBJS) $(OBJ_DIR) @cp $(SQLITE) $(OBJ_DIR) - @echo "AR\t\t$(L_MORPHUX) $(L_CURL) $(L_JSON)" - @cd $(OBJ_DIR) && ar -x $(L_MORPHUX) && ar -x $(L_CURL) && ar -x $(L_JSON) + @echo "AR\t\t$(L_MORPHUX) $(L_CURL) $(L_JSON) $(L_CONF)" + @cd $(OBJ_DIR) && ar -x $(L_MORPHUX) && ar -x $(L_CURL) && ar -x $(L_JSON) && ar -x $(L_CONF) @echo "CCLD\t\t$(NAME)" @$(LIB) $(ARFLAGS) $(NAME) objs/*.o @rm -rf $(OBJ_DIR) @@ -74,6 +76,7 @@ init: make -C lib/libmorphux cd lib/curl/ && ./buildconf && ./configure --disable-shared --enable-debug --enable-maintainer-mode && make cd lib/json-c/ && sh autogen.sh && ./configure --disable-shared && make + cd lib/libconfuse/ && sh autogen.sh && ./configure && make docs: doxygen docs/doxyfile diff --git a/lib/libconfuse b/lib/libconfuse @@ -0,0 +1 @@ +Subproject commit e4bab57eaea813d5631540ccca9bfe7a2daadf4f