Skip to content

Commit

Permalink
Remove hiredis submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
orgads committed Sep 29, 2024
1 parent a8e4756 commit 5ce10c2
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
libboost-thread-dev
libcurl4-openssl-dev
libgoogle-perftools-dev
libhiredis-dev
libtool
libtool-bin
libunwind-dev
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,3 @@
[submodule "deps/jansson"]
path = deps/jansson
url = https://github.com/akheron/jansson.git
[submodule "deps/hiredis"]
path = deps/hiredis
url = https://github.com/redis/hiredis.git
14 changes: 0 additions & 14 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ INCLUDES= -I${srcdir}/deps/sofia-sip/libsofia-sip-ua/su -I${srcdir}/deps/sofia-s
AM_LDFLAGS= -L/usr/local/lib -L${srcdir}/deps/prometheus-cpp/build/lib
LDADD= -lboost_thread -lpthread -lssl -lcrypto -lz

if DEP_HIREDIS
INCLUDES += -I${srcdir}/deps
AM_LDFLAGS += -L${srcdir}/deps/hiredis
endif

bin_PROGRAMS= drachtio timer ssltest parser uri_test test_https test_asio_curl

ACLOCAL_AMFLAGS = -I m4
Expand Down Expand Up @@ -83,10 +78,6 @@ endif
BUILT_SOURCES=${srcdir}/deps/sofia-sip/libsofia-sip-ua/.libs/libsofia-sip-ua.a \
${srcdir}/deps/jansson/src/.libs/libjansson.a ${srcdir}/deps/prometheus-cpp/build/lib/libprometheus-cpp-core.a

if DEP_HIREDIS
BUILT_SOURCES += ${srcdir}/deps/hiredis/libhiredis.a
endif

clean-local:

${srcdir}/deps/sofia-sip/libsofia-sip-ua/.libs/libsofia-sip-ua.a:
Expand All @@ -99,8 +90,3 @@ ${srcdir}/deps/prometheus-cpp/build/lib/libprometheus-cpp-core.a ${srcdir}/deps/
cd ${srcdir}/deps/prometheus-cpp && mkdir -p build && cd build && \
cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX=`pwd` && \
$(MAKE) && make install

if DEP_HIREDIS
${srcdir}/deps/hiredis/libhiredis.a:
cd ${srcdir}/deps/hiredis && cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_SSL=ON . && $(MAKE)
endif
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ AC_LANG(C++)
AX_CXX_COMPILE_STDCXX_11()
AX_CXX_COMPILE_STDCXX_17(noext, optional)

AM_CONDITIONAL([DEP_HIREDIS], [test -f "${srcdir}/deps/hiredis/CMakeLists.txt"])
AM_CONDITIONAL(OSX, false)
AM_CONDITIONAL(LINUX, false)

Expand Down Expand Up @@ -49,4 +48,4 @@ LIBCURL_CHECK_CONFIG

# Checks for library functions.
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
AC_OUTPUT
1 change: 0 additions & 1 deletion deps/hiredis
Submodule hiredis deleted from 60e507

0 comments on commit 5ce10c2

Please sign in to comment.