Skip to content

Commit f52468b

Browse files
committed
Hoist a regular all target for CMake
1 parent 4ae8d03 commit f52468b

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

Makefile

+3-10
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ DEVOBJS = $(DEVICES:%=%.o)
3535
PDEVOBJS = $(PDEVICES:%=%,dy.o)
3636
PDEVLIBS = $(PDEVICES:%=libtenyr%$(DYLIB_SUFFIX))
3737

38-
BIN_TARGETS += tas tsim tld
39-
LIB_TARGETS += $(PDEVLIBS)
40-
41-
TARGETS = $(BIN_TARGETS) $(LIB_TARGETS) $(TEST_TARGETS)
4238
RESOURCES := $(wildcard rsrc/64/*.png) \
4339
rsrc/font10x15/invert.font10x15.png \
4440
$(wildcard plugins/*.rcp) \
@@ -110,7 +106,6 @@ clean_FILES = \
110106
*.d \
111107
parser.[ch] \
112108
lexer.[ch] \
113-
$(TARGETS) \
114109
$(SOURCEFILES:src/%.c=%.d) \
115110
$(VPIFILES:hw/vpi/%.c=%.d) \
116111
random random.* \
@@ -127,8 +122,6 @@ tld_OBJECTS = $(common_OBJECTS) obj.o
127122
################################################################################
128123
DROP_TARGETS = clean
129124

130-
all: $(TARGETS)
131-
132125
-include mk/os/rules/$(OS).mk
133126

134127
tas: tas.o $(tas_OBJECTS)
@@ -166,9 +159,11 @@ ifeq ($(filter $(DROP_TARGETS),$(MAKECMDGOALS)),)
166159
-include parser.d
167160
endif
168161

169-
check: icarus
162+
all:
170163
cmake -S . -B cmake_build -DJIT=${JIT} -DSDL=${SDL} -DICARUS=${ICARUS}
171164
cmake --build cmake_build
165+
166+
check: all icarus
172167
cmake -S . -B cmake_build -DJIT=${JIT} -DSDL=${SDL} -DICARUS=${ICARUS} -DTESTING=1
173168
cmake --build cmake_build
174169
export PATH=$(abspath .):$$PATH && cd cmake_build && ctest --rerun-failed --output-on-failure
@@ -200,8 +195,6 @@ tenyr: INCLUDES += $(INCLUDE_OS)
200195

201196
clean_FILES += tenyr *.o
202197

203-
all: tenyr
204-
205198
vpath %.v hw/verilog hw/verilog/sim hw/icarus
206199
vpath %.v 3rdparty/wb_intercon/rtl/verilog
207200

0 commit comments

Comments
 (0)