@@ -250,8 +250,7 @@ LIBRARY_PATH := /usr/local/lib
250250endif
251251
252252CPPFLAGS += -DBINTOPKGLIBEXECDIR="\"$(shell sh tools/rel.sh $(bindir ) $(pkglibexecdir ) ) \""
253- 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
254- CFLAGS = $(CPPFLAGS ) $(CWARNFLAGS ) $(CMNFLAGS )
253+ 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
255254
256255# If CFLAGS is already set in the environment of make (to whatever value, it
257256# 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
@@ -416,8 +414,7 @@ PKGLIBEXEC_PROGRAMS = \
416414 lightningd/lightning_hsmd \
417415 lightningd/lightning_onchaind \
418416 lightningd/lightning_openingd \
419- lightningd/lightning_websocketd \
420- lightningd/remote_hsmd
417+ lightningd/lightning_websocketd
421418
422419mkdocs.yml : $(MANPAGES:=.md )
423420 @$(call VERBOSE, "genidx $@ ", \
@@ -453,10 +450,6 @@ else
453450PYTEST_OPTS += -x
454451endif
455452
456- ifneq ($(PYTEST_MOREOPTS ) ,)
457- PYTEST_OPTS += $(PYTEST_MOREOPTS )
458- endif
459-
460453check-units :
461454
462455check : check-units installcheck check-protos pytest
0 commit comments