@@ -242,8 +242,7 @@ LIBRARY_PATH := /usr/local/lib
242242endif
243243
244244CPPFLAGS += -DBINTOPKGLIBEXECDIR="\"$(shell sh tools/rel.sh $(bindir ) $(pkglibexecdir ) ) \""
245- CMNFLAGS = $(CDEBUGFLAGS ) $(COPTFLAGS ) -I $(CCANDIR ) $(EXTERNAL_INCLUDE_FLAGS ) -I . -I$(CPATH ) $(SQLITE3_CFLAGS ) $(POSTGRES_INCLUDE ) $(FEATURES ) $(COVFLAGS ) $(DEV_CFLAGS ) -DSHACHAIN_BITS=48 -DJSMN_PARENT_LINKS $(PIE_CFLAGS ) $(COMPAT_CFLAGS ) $(CSANFLAGS ) -DBUILD_ELEMENTS=1
246- CFLAGS = $(CPPFLAGS ) $(CWARNFLAGS ) $(CMNFLAGS )
245+ CFLAGS = $(CPPFLAGS ) $(CWARNFLAGS ) $(CDEBUGFLAGS ) $(COPTFLAGS ) -I $(CCANDIR ) $(EXTERNAL_INCLUDE_FLAGS ) -I . -I$(CPATH ) $(SQLITE3_CFLAGS ) $(POSTGRES_INCLUDE ) $(FEATURES ) $(COVFLAGS ) $(DEV_CFLAGS ) -DSHACHAIN_BITS=48 -DJSMN_PARENT_LINKS $(PIE_CFLAGS ) $(COMPAT_CFLAGS ) $(CSANFLAGS ) -DBUILD_ELEMENTS=1
247246
248247# If CFLAGS is already set in the environment of make (to whatever value, it
249248# does not matter) then it would export it to subprocesses with the above value
@@ -360,7 +359,6 @@ include devtools/Makefile
360359include tools/Makefile
361360include plugins/Makefile
362361include tests/plugins/Makefile
363- include contrib/remote_hsmd/Makefile
364362
365363ifneq ($(FUZZING ) ,0)
366364 include tests/fuzz/Makefile
@@ -409,8 +407,7 @@ PKGLIBEXEC_PROGRAMS = \
409407 lightningd/lightning_hsmd \
410408 lightningd/lightning_onchaind \
411409 lightningd/lightning_openingd \
412- lightningd/lightning_websocketd \
413- lightningd/remote_hsmd
410+ lightningd/lightning_websocketd
414411
415412mkdocs.yml : $(MANPAGES:=.md )
416413 @$(call VERBOSE, "genidx $@ ", \
@@ -446,10 +443,6 @@ else
446443PYTEST_OPTS += -x
447444endif
448445
449- ifneq ($(PYTEST_MOREOPTS ) ,)
450- PYTEST_OPTS += $(PYTEST_MOREOPTS )
451- endif
452-
453446check-units :
454447
455448check : check-units installcheck check-protos pytest
0 commit comments