Skip to content

Commit 8b5a22e

Browse files
committed
feat: better makefile dependency management
1 parent 649d850 commit 8b5a22e

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
WASM_OUT_DIR := wasm
22
WASM_OUT_NAME := libpg-query
33
WASM_MODULE_NAME := PgQueryModule
4-
LIBPG_QUERY_REPO := https://github.com/gregnr/libpg_query.git
5-
LIBPG_QUERY_BRANCH := fix/ar-command-in-makefile
4+
LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
5+
LIBPG_QUERY_BRANCH := 15-latest
66
CACHE_DIR := .cache
77

88
OS ?= $(shell uname -s)
@@ -24,7 +24,9 @@ endif
2424

2525
PLATFORM_ARCH := $(PLATFORM)-$(ARCH)
2626
SRC_FILES := $(wildcard src/*.cc)
27-
LIBPG_QUERY_DIR := $(CACHE_DIR)/$(PLATFORM_ARCH)/libpg_query
27+
LIBPG_QUERY_DIR := $(CACHE_DIR)/$(PLATFORM_ARCH)/libpg_query/$(LIBPG_QUERY_BRANCH)
28+
LIBPG_QUERY_ARCHIVE := $(LIBPG_QUERY_DIR)/libpg_query.a
29+
LIBPG_QUERY_HEADER := $(LIBPG_QUERY_DIR)/pg_query.h
2830
CXXFLAGS := -O3
2931

3032
ifdef EMSCRIPTEN
@@ -47,12 +49,19 @@ clean:
4749
clean-cache:
4850
-@ rm -rf $(LIBPG_QUERY_DIR)
4951

52+
# Clone libpg_query source (lives in CACHE_DIR)
5053
$(LIBPG_QUERY_DIR):
5154
mkdir -p $(CACHE_DIR)
5255
git clone -b $(LIBPG_QUERY_BRANCH) --single-branch $(LIBPG_QUERY_REPO) $(LIBPG_QUERY_DIR)
56+
57+
$(LIBPG_QUERY_HEADER): $(LIBPG_QUERY_DIR)
58+
59+
# Build libpg_query
60+
$(LIBPG_QUERY_ARCHIVE): $(LIBPG_QUERY_DIR)
5361
cd $(LIBPG_QUERY_DIR); $(MAKE) build
5462

55-
$(OUT_FILES): $(LIBPG_QUERY_DIR) $(SRC_FILES)
63+
# Build libpg-query-node (based on platform)
64+
$(OUT_FILES): $(LIBPG_QUERY_ARCHIVE) $(LIBPG_QUERY_HEADER) $(SRC_FILES)
5665
ifdef EMSCRIPTEN
5766
@ $(CXX) \
5867
$(CXXFLAGS) \

0 commit comments

Comments
 (0)