Fix cloning capstone with make subproject

Author: satk0

libr/arch/p/capstone.mk

@@ -1,19 +1,29 @@
-ifeq ($(WANT_CAPSTONE),1)
-ifeq ($(USE_CAPSTONE),1)
-CS_CFLAGS=${CAPSTONE_CFLAGS}
-CS_LDFLAGS=${CAPSTONE_LDFLAGS}
+ifeq ($(USE_CSNEXT),1)
+  CS_ROOT=../../../subprojects/capstone-next
+else
+ifeq ($(USE_CS4),1)
+  CS_ROOT=../../../subprojects/capstone-v4
 else
-CS_CFLAGS=-I../../shlr/capstone/include
-CS_CFLAGS+=-I../../../shlr/capstone/include
-CS_CFLAGS+=-I../../shlr/capstone/include/capstone
-CS_CFLAGS+=-I../../../shlr/capstone/include/capstone
-CS_LDFLAGS=$(SHLR)/capstone/libcapstone.a
+  CS_ROOT=../../../subprojects/capstone-v5
 endif
-
-ifeq ($(CS_CFLAGS_INCLUDED),)
-CFLAGS+=$(CS_CFLAGS)
-CS_CFLAGS_INCLUDED=Yes
 endif
+
+ifeq ($(WANT_CAPSTONE),1)
+  ifeq ($(USE_CAPSTONE),1)
+    CS_CFLAGS=${CAPSTONE_CFLAGS}
+    CS_LDFLAGS=${CAPSTONE_LDFLAGS}
+  else
+    CS_CFLAGS=-I$(CS_ROOT)/include
+    CS_CFLAGS+=-I$(CS_ROOT)/include/capstone
+    CS_LDFLAGS=$(CS_ROOT)/libcapstone.a
+  endif
+
+  $(info [cs_flags] - $(CS_CFLAGS))
+
+  ifeq ($(CS_CFLAGS_INCLUDED),)
+    CFLAGS+=$(CS_CFLAGS)
+    CS_CFLAGS_INCLUDED=Yes
+  endif
 else
-CS_CFLAGS=
+  CS_CFLAGS=
 endif

shlr/Makefile

@@ -47,7 +47,7 @@ CS_URL_BASE=github.com/capstone-engine/capstone
 CS_URL=$(GIT_PREFIX)$(CS_URL_BASE).git
 CS_ARCHIVE=https://$(CS_URL_BASE)/archive
 CS_UPD=20201203
-# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/meson.build
+
 ifeq ($(USE_CSNEXT),1)
 # CS_TIP=0a29bf80017b8422c79ba51e3ad5c34ba5ee6142
 # CS_BRA=next
@@ -63,6 +63,7 @@ else
 CS_ROOT=../subprojects/capstone-v5
 endif
 endif
+
 ifeq ($(CS_COMMIT_ARCHIVE),1)
 CS_ARCHIVE_URL=$(CS_ARCHIVE)/$(CS_TIP).zip
 else

subprojects/Makefile

@@ -1,12 +1,14 @@
 DEPS=sdb v35armv7 v35arm64 qjs
 ifeq ($(USE_CS4),1)
-	DEPS += capstone-v4
-else ifeq ($(USE_CS5),1)
-	DEPS += capstone-v5
+  DEPS += capstone-v4
 else ifeq ($(USE_CSNEXT),1)
-	DEPS += capstone-next
+  DEPS += capstone-next
+else
+  DEPS += capstone-v5
 endif
 
+$(info [-=--=] DEPS CAPSOTONE= $(DEPS))
+
 all: $(DEPS)
 
 clean:
@@ -16,10 +18,10 @@ include sdb.mk
 include v35armv7.mk
 include v35arm64.mk
 ifeq ($(USE_CS4),1)
-	include capstone-v4.mk
-else ifeq ($(USE_CS5),1)
-	include capstone-v5.mk
+  include capstone-v4.mk
 else ifeq ($(USE_CSNEXT),1)
-	include capstone-next.mk
+  include capstone-next.mk
+else
+  include capstone-v5.mk
 endif
 include qjs.mk