Browse Source

Remove re2c, lmdb, xxhash source code dependencies.

Stefano Cossu 1 year ago
parent
commit
20f1e71094
2 changed files with 1 additions and 43 deletions
  1. 0 18
      .gitmodules
  2. 1 25
      Makefile

+ 0 - 18
.gitmodules

@@ -1,21 +1,7 @@
-[submodule "ext/xxHash"]
-	path = ext/xxHash
-	url = https://github.com/Cyan4973/xxHash.git
-	branch = release
-    shallow = true
 [submodule "ext/uuid4"]
 	path = ext/uuid4
 	url = https://github.com/rxi/uuid4.git
     shallow = true
-[submodule "ext/openldap"]
-	path = ext/openldap
-	url = https://git.openldap.org/openldap/openldap.git
-	branch = mdb.RE/0.9
-    shallow = true
-[submodule "ext/uthash"]
-	path = ext/uthash
-	url = https://github.com/troydhanson/uthash.git
-    shallow = true
 [submodule "ext/log"]
 	path = ext/log
 	url = https://github.com/rxi/log.c.git
@@ -24,10 +10,6 @@
 	path = ext/tpl
 	url = https://github.com/troydhanson/tpl.git
     shallow = true
-[submodule "ext/re2c"]
-	path = ext/re2c
-	url = https://github.com/skvadrik/re2c.git
-    shallow = true
 [submodule "ext/hashmap"]
 	path = ext/hashmap
 	url = https://github.com/tidwall/hashmap.c

+ 1 - 25
Makefile

@@ -12,14 +12,11 @@ PREFIX ?= /usr/local
 bindir ::= $(PREFIX)/bin
 libdir ::= $(PREFIX)/lib
 includedir = $(PREFIX)/include/lsup
-MDB_DIR = ext/openldap/libraries/liblmdb
-XXHASH_DIR = ext/xxHash
 VALGRIND_DUMP = /tmp/lsup_valgrind.log
 CALLGRIND_DUMP = /tmp/lsup_callgrind.out
 MASSIF_DUMP = /tmp/lsup_massif.out
 
-INCLUDE_BASE ::= . -Iinclude -I$(MDB_DIR) -I$(XXHASH_DIR) \
-	-Iext/tpl/src -Iext/hashmap -Iext/log/src
+INCLUDE_BASE ::= . -Iinclude -Iext/tpl/src -Iext/hashmap -Iext/log/src
 INCLUDE ::= -I$(INCLUDE_BASE)
 _CFLAGS ::= -std=gnu11 -Wall -fPIC -MMD $(INCLUDE)
 CFLAGS = $(_CFLAGS) -O3
@@ -58,7 +55,6 @@ CODEC_DBG_OBJ = $(CODEC_SRC:.c=_dbg.o)
 OBJ = $(EXT_OBJ) $(LSUP_SRC:.c=.o)
 DBG_OBJ = $(EXT_OBJ) $(LSUP_SRC:.c=_dbg.o)
 
-DEPLIBS = libxxhash liblmdb
 LIBS = liblsuprdf.a liblsuprdf.so
 DBG_LIBS = liblsuprdf_dbg.a liblsuprdf_dbg.so
 
@@ -132,22 +128,8 @@ $(PARSER): $(LEMON_SRC)
 	$(CC) $^ -o $@
 
 
-# Ext libraries.
-
-.PHONY: libxxhash
-libxxhash:
-	$(MAKE) -C $(XXHASH_DIR)
-
-
-.PHONY: liblmdb
-liblmdb:
-	$(MAKE) -C $(MDB_DIR)
-
-
 install: lib ## Install library and dependencies to $PREFIX. May require sudo.
 	@echo "Installing library files in $(PREFIX)."
-	PREFIX=$(PREFIX) make -C $(MDB_DIR) install
-	PREFIX=$(PREFIX) make -C $(XXHASH_DIR) install
 	mkdir -p $(DESTDIR)$(libdir)
 	mkdir -p $(DESTDIR)$(includedir)
 	cp liblsuprdf.a liblsuprdf.so $(DESTDIR)$(libdir) && \
@@ -168,12 +150,6 @@ clean:
 	rm -f src/codec/grammar_*.c src/codec/parser_*.c
 
 
-.PHONY: deepclean ## Clean up external libraries.
-deepclean: clean
-	make -C $(MDB_DIR) clean
-	make -C $(XXHASH_DIR) clean
-
-
 .PHONY: uninstall ## Uninstall library (not the dependencies).
 uninstall:
 	rm -f $(DESTDIR)$(libdir)/liblsuprdf*