Skip to content

X
xv6-public
提交 f3ab6618 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

Remove some duplicate rules

上级 224c53b4
隐藏空白字符变更
内嵌 并排
正在显示 包含 9 行增加 和 26 行删除
Makefile
浏览文件 @ f3ab6618
...@@ -58,6 +58,11 @@ $(O)/%.o: %.cc ...@@ -58,6 +58,11 @@ $(O)/%.o: %.cc
$(Q)mkdir -p $(@D) $(Q)mkdir -p $(@D)
$(Q)$(CXX) $(CXXFLAGS) $(XXFLAGS) -c -o $@ $< $(Q)$(CXX) $(CXXFLAGS) $(XXFLAGS) -c -o $@ $<
$(O)/%.o: %.S
@echo " CC $@"
$(Q)mkdir -p $(@D)
$(Q)$(CC) $(ASFLAGS) -c -o $@ $<
xv6memfs.img: bootblock kernelmemfs xv6memfs.img: bootblock kernelmemfs
dd if=/dev/zero of=xv6memfs.img count=10000 dd if=/dev/zero of=xv6memfs.img count=10000
dd if=bootblock of=xv6memfs.img conv=notrunc dd if=bootblock of=xv6memfs.img conv=notrunc
......
kernel/Makefrag
浏览文件 @ f3ab6618
...@@ -67,10 +67,6 @@ $(O)/kernel/%.o: CXXFLAGS+=-mcmodel=large ...@@ -67,10 +67,6 @@ $(O)/kernel/%.o: CXXFLAGS+=-mcmodel=large
$(O)/kernel/incbin.o: ASFLAGS+=-DMAKE_OUT=$(O) $(O)/kernel/incbin.o: ASFLAGS+=-DMAKE_OUT=$(O)
$(O)/kernel/incbin.o: $(O)/kernel/initcode $(O)/kernel/bootother $(O)/fs.img $(O)/kernel/incbin.o: $(O)/kernel/initcode $(O)/kernel/bootother $(O)/fs.img
$(O)/kernel/%.o: kernel/%.S
@echo " CC $@"
$(Q)mkdir -p $(@D)
$(Q)$(CC) $(ASFLAGS) -c -o $@ $<
$(O)/kernel/initcode: TTEXT = 0x0 $(O)/kernel/initcode: TTEXT = 0x0
$(O)/kernel/bootother: TTEXT = 0x7000 $(O)/kernel/bootother: TTEXT = 0x7000
......
lib/Makefrag
浏览文件 @ f3ab6618
ULIB = ulib.o usys.o printf.o umalloc.o uthread.o fmt.o ULIB = ulib.o usys.o printf.o umalloc.o uthread.o fmt.o
ULIB := $(addprefix $(O)/lib/, $(ULIB)) ULIB := $(addprefix $(O)/lib/, $(ULIB))
$(O)/lib/%.o: lib/%.S
@echo " CC $@"
$(Q)$(CC) $(ASFLAGS) -c -o $@ $<
.PRECIOUS: $(O)/lib/%.o .PRECIOUS: $(O)/lib/%.o
-include $(O)/lib/*.d -include $(O)/lib/*.d
net/Makefrag
浏览文件 @ f3ab6618
...@@ -14,8 +14,7 @@ LFLAGS += -llwip ...@@ -14,8 +14,7 @@ LFLAGS += -llwip
CFLAGS += -Ilwip/src/include -Inet -Ilwip/src/include/ipv4 -DLWIP CFLAGS += -Ilwip/src/include -Inet -Ilwip/src/include/ipv4 -DLWIP
CXXFLAGS += -Ilwip/src/include -Inet -Ilwip/src/include/ipv4 -DLWIP CXXFLAGS += -Ilwip/src/include -Inet -Ilwip/src/include/ipv4 -DLWIP
LWIP_CFLAGS = $(COMFLAGS) -std=c99 \ LWIP_CFLAGS = -Wno-attributes \
-Wno-attributes \
-Wno-address \ -Wno-address \
-Wno-char-subscripts \ -Wno-char-subscripts \
-Wno-unused-but-set-variable \ -Wno-unused-but-set-variable \
...@@ -26,8 +25,7 @@ LWIP_INCLUDES := \ ...@@ -26,8 +25,7 @@ LWIP_INCLUDES := \
-Ilwip/src/include \ -Ilwip/src/include \
-Ilwip/src/include/ipv4 \ -Ilwip/src/include/ipv4 \
-Inet \ -Inet \
-Inet/arch \ -Inet/arch
-I.
LWIP_SRCFILES += \ LWIP_SRCFILES += \
lwip/src/api/api_lib.c \ lwip/src/api/api_lib.c \
...@@ -59,23 +57,11 @@ LWIP_SRCFILES += \ ...@@ -59,23 +57,11 @@ LWIP_SRCFILES += \
lwip/src/core/udp.c \ lwip/src/core/udp.c \
lwip/src/netif/etharp.c \ lwip/src/netif/etharp.c \
net/sys_arch.c \ net/sys_arch.c \
net/if.c \ net/if.c
LWIP_OBJFILES := $(patsubst %.c, $(O)/%.o, $(LWIP_SRCFILES)) LWIP_OBJFILES := $(patsubst %.c, $(O)/%.o, $(LWIP_SRCFILES))
LWIP_OBJFILES := $(patsubst %.S, $(O)/%.o, $(LWIP_OBJFILES))
$(O)/net/%.o: CFLAGS+=-mcmodel=large
$(O)/net/%.o: CXXFLAGS+=-mcmodel=large $(O)/net/%.o: CXXFLAGS+=-mcmodel=large
$(O)/lwip/src/%.o: CFLAGS+=-mcmodel=large $(LWIP_CFLAGS) $(LWIP_INCLUDES)
$(O)/net/%.o: net/%.c
@echo " CC $@"
$(Q)mkdir -p $(@D)
$(Q)$(CC) $(LWIP_CFLAGS) $(LWIP_INCLUDES) -c -o $@ $<
$(O)/lwip/src/%.o: lwip/src/%.c
@echo " CC $@"
$(Q)mkdir -p $(@D)
$(Q)$(CC) $(LWIP_CFLAGS) $(LWIP_INCLUDES) -c -o $@ $<
$(O)/liblwip.a: $(LWIP_OBJFILES) $(O)/liblwip.a: $(LWIP_OBJFILES)
@echo " AR $@" @echo " AR $@"
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论