From abe3588e56850403f7ebaf3c9090552e5f4830c6 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 19 Sep 2022 16:19:01 +0200
Subject: Exports: Simplify building

- Remove subdir c
- Do not compile c code as a separate shared library
- Move all definitions/declarations into the preamble as they shouldn't be shared anyways. So no headers are needed
- Define the callback as static, needed so we don't get a duplicate declaration
---
 exports/Makefile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'exports/Makefile')

diff --git a/exports/Makefile b/exports/Makefile
index 46d17a9..1434f8b 100644
--- a/exports/Makefile
+++ b/exports/Makefile
@@ -2,8 +2,6 @@
 
 include common.mk
 
-CLIBPATH=./c
-
 ifeq ($(LIB_SUFFIX),.so)
 # Add SONAME as cgo does not currently do this. Mostly for Android, see https://stackoverflow.com/a/48291044
 export override CGO_LDFLAGS += -Wl,-soname,$(LIB_FILE)
@@ -15,18 +13,12 @@ ifdef COPY_LIB_TO
 	install $< -Dt $(COPY_LIB_TO)
 endif
 
-${CLIBPATH}/libcommon$(LIB_SUFFIX): ${CLIBPATH}/common.c
-	$(CC) -c -Wall -Werror -fpic -o ${CLIBPATH}/common.o ${CLIBPATH}/common.c
-	$(CC) -shared -o $@ ${CLIBPATH}/common.o
-
 # Build shared library and remove lib prefix (if any) from header name
 # GOOS and GOARCH envvars are set by common.mk
 # This extra target prevents unnecessary rebuild
-lib/$(GOOS)/$(GOARCH)/$(LIB_FILE): ${CLIBPATH}/libcommon$(LIB_SUFFIX) exports.go servers.go ..
+lib/$(GOOS)/$(GOARCH)/$(LIB_FILE): ..
 	CGO_ENABLED=1 go build -o $@ -buildmode=c-shared .
 	mv lib/$(GOOS)/$(GOARCH)/$(LIB_PREFIX)$(LIB_NAME).h lib/$(GOOS)/$(GOARCH)/$(LIB_NAME).h || true	# Normalize header name
 
 clean:
 	rm -rf ../exports/lib/*
-	rm -rf ${CLIBPATH}/common.o
-	rm -rf ${CLIBPATH}/libcommon.so
-- 
cgit v1.2.3