Makefile

@@ -23,7 +23,6 @@
 #
 
 # artifact paths
-SRC:=src
 BUILD:=build
 BIN:=bin
 
@@ -51,7 +50,7 @@ EXE=
 endif
 CC=$(CROSS_PREFIX)gcc
 STRIP=$(CROSS_PREFIX)strip
-CFLAGS=-O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -MMD -Isrc -Isrc/slirp
+CFLAGS=-O2 -Wall -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -MMD
 CFLAGS+=-D_GNU_SOURCE -DCONFIG_VERSION=\"$(shell cat VERSION)\"
 LDFLAGS=
 
@@ -65,7 +64,7 @@ PROGS+=build_filelist splitimg
 endif
 endif
 
-all: $(addprefix $(BIN)/,$(PROGS))
+all: $(PROGS)
 
 EMU_OBJS:=virtio.o pci.o fs.o cutils.o iomem.o simplefb.o \
     json.o machine.o temu.o
@@ -108,34 +107,35 @@ CFLAGS+=-DCONFIG_X86EMU
 EMU_OBJS+=x86_cpu.o x86_machine.o ide.o ps2.o vmmouse.o pckbd.o vga.o
 endif
 
-# macros to relevant path definitions
+# macro to prepend $(BUILD)
 define mkbuild
-$(addprefix $(BUILD)/,$1)
+$(addprefix $(BUILD)/,$(1))
 endef
 
-$(BIN)/temu$(EXE): $(BUILD) $(BIN) $(call mkbuild,$(EMU_OBJS))
+temu$(EXE): $(BUILD) $(BIN) $(EMU_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(call mkbuild,$(EMU_OBJS)) $(EMU_LIBS)
+	$(CC) $(LDFLAGS) -o $(BIN)/$@ $(call mkbuild,$(EMU_OBJS)) $(EMU_LIBS)
 
-$(BUILD)/riscv_cpu32.o: $(SRC)/riscv_cpu.c
+riscv_cpu32.o: riscv_cpu.c
-	$(CC) $(CFLAGS) -DMAX_XLEN=32 -c -o $@ $<
+	$(CC) $(CFLAGS) -DMAX_XLEN=32 -c -o $(BUILD)/$@ $<
 
-$(BUILD)/riscv_cpu64.o: $(SRC)/riscv_cpu.c
+riscv_cpu64.o: riscv_cpu.c
-	$(CC) $(CFLAGS) -DMAX_XLEN=64 -c -o $@ $<
+	$(CC) $(CFLAGS) -DMAX_XLEN=64 -c -o $(BUILD)/$@ $<
 
-$(BUILD)/riscv_cpu128.o: $(SRC)/riscv_cpu.c
+riscv_cpu128.o: riscv_cpu.c
-	$(CC) $(CFLAGS) -DMAX_XLEN=128 -c -o $@ $<
+	$(CC) $(CFLAGS) -DMAX_XLEN=128 -c -o $(BUILD)/$@ $<
 
-$(BIN)/build_filelist: $(BUILD)/build_filelist.o $(BUILD)/fs_utils.o $(BUILD)/cutils.o
+build_filelist: build_filelist.o fs_utils.o cutils.o
-	$(CC) $(LDFLAGS) -o $@ $^ -lm
+	$(CC) $(LDFLAGS) -o $(BIN)/$@ $(call mkbuild,$^) -lm
 
-$(BIN)/splitimg: $(BUILD)/splitimg.o
+splitimg: splitimg.o
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $(LDFLAGS) -o $(BIN)/$@ $(call mkbuild,$^)
 
-$(BUILD)/%.o: $(SRC)/%.c
+install: $(PROGS)
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(STRIP) $(PROGS)
+	$(INSTALL) -m755 $(PROGS) "$(DESTDIR)$(bindir)"
 
-$(BUILD)/slirp/%.o: $(SRC)/slirp/%.c
+%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $(BUILD)/$@ $<
 
 .PHONY: $(BUILD)
 $(BUILD):
@@ -145,15 +145,10 @@ $(BUILD):
 $(BIN):
 	@mkdir -p $@
 
-.PHONY: install
-install: $(PROGS)
-	$(STRIP) $(PROGS)
-	$(INSTALL) -m755 $(PROGS) "$(DESTDIR)$(bindir)"
-
 .PHONY: clean
 clean:
 	rm -f *~ $(PROGS)
 	rm -rf $(BUILD)
 
--include $(wildcard build/*.d)
+-include $(wildcard $(BUILD)/*.d)
 -include $(wildcard $(BUILD)/slirp/*.d)

VERSION

@@ -1 +1 @@
-cry-2025-7-22
+2019-12-21

src/temu.d

@@ -1,3 +0,0 @@
-src/temu: src/temu.c src/cutils.h src/iomem.h src/virtio.h src/pci.h \
- src/fs.h src/machine.h src/json.h src/fs_utils.h src/fs_wget.h \
- src/slirp/libslirp.h