From fc4b12725cf5b52e337a102daae2bb9fed8d2ade Mon Sep 17 00:00:00 2001 From: feelfree69 Date: Tue, 10 Mar 2026 21:57:16 +0100 Subject: [PATCH] Cleanup Makefile --- Makefile | 27 +++++++++++---------------- httpd/Makefile | 26 -------------------------- uip/Makefile | 26 -------------------------- 3 files changed, 11 insertions(+), 68 deletions(-) delete mode 100644 httpd/Makefile delete mode 100644 uip/Makefile diff --git a/Makefile b/Makefile index e403d34..e903b92 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ CC_FLAGS = -mmcs51 -I. -Ihttpd -Iuip ASM = sdas8051 AFLAGS= -plosgff -SUBDIRS := tools uip httpd +SUBDIRS := tools SUBDIRSCLEAN=$(addsuffix clean,$(SUBDIRS)) BUILDDIR = output/ @@ -24,11 +24,14 @@ all: create_build_dir $(VERSION_HEADER) $(SUBDIRS) $(BUILDDIR)rtlplayground.bin create_build_dir: mkdir -p $(BUILDDIR) + mkdir -p $(BUILDDIR)/uip + mkdir -p $(BUILDDIR)/httpd -SRCS = rtlplayground.c rtl837x_flash.c rtl837x_leds.c rtl837x_phy.c rtl837x_port.c cmd_parser.c html_data.c rtl837x_igmp.c \ - rtl837x_stp.c rtl837x_pins.c dhcp.c machine.c cmd_editor.c rtl837x_bandwidth.c +SRCS = rtlplayground.c rtl837x_flash.c rtl837x_leds.c rtl837x_phy.c rtl837x_port.c cmd_parser.c html_data.c rtl837x_igmp.c +SRCS += rtl837x_stp.c rtl837x_pins.c dhcp.c machine.c cmd_editor.c rtl837x_bandwidth.c +SRCS += uip/timer.c uip/uip.c uip/uip_arp.c uip/uiplib.c uip/uip-fw.c uip/uip-neighbor.c uip/uip-split.c +SRCS += httpd/httpd.c httpd/page_impl.c OBJS = ${SRCS:%.c=$(BUILDDIR)%.rel} -OBJS += uip/$(BUILDDIR)/timer.rel uip/$(BUILDDIR)/uip-fw.rel uip/$(BUILDDIR)/uip-neighbor.rel uip/$(BUILDDIR)/uip-split.rel uip/$(BUILDDIR)/uip.rel uip/$(BUILDDIR)/uip_arp.rel uip/$(BUILDDIR)/uiplib.rel httpd/$(BUILDDIR)/httpd.rel httpd/$(BUILDDIR)/page_impl.rel html_data.c html_data.h: html tools tools/$(BUILDDIR)fileadder -a $(HTML_LOCATION) -s $(IMAGESIZE) -b BANK1 -d html -p html_data @@ -46,21 +49,13 @@ $(SUBDIRS): $(MAKE) -C $@ clean: - -make -C uip clean - -make -C httpd clean - -rm html_data.c html_data.h $(VERSION_HEADER) - -rm -r $(BUILDDIR) - -$(BUILDDIR)crtstart.rel: crtstart.asm - $(ASM) $(AFLAGS) -o $@ $< - -$(BUILDDIR)crc16.rel: crc16.asm - $(ASM) $(AFLAGS) -o $@ $< + -rm -f html_data.c html_data.h $(VERSION_HEADER) + -rm -rf $(BUILDDIR) $(BUILDDIR)%.rel: %.c $(CC) $(CC_FLAGS) -o $@ -c $< -$(BUILDDIR)%.rel: $(BUILDDIR)%.asm +$(BUILDDIR)%.rel: %.asm ${ASM} ${AFLAGS} -o $@ $< # mv -f $(addprefix $(basename $^), .lst .rel .sym) . @@ -79,4 +74,4 @@ $(BUILDDIR)rtlplayground.bin: $(BUILDDIR)rtlplayground.img tools/$(BUILDDIR)crc_calculator -u $@ -.PHONY: clean all $(SUBDIRS) +.PHONY: clean all $(SUBDIRS) $(VERSION_HEADER) diff --git a/httpd/Makefile b/httpd/Makefile deleted file mode 100644 index 242c8b7..0000000 --- a/httpd/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -CC = sdcc -CC_FLAGS = -mmcs51 -I. -I.. -I../uip -ASM = sdas8051 -AFLAGS= -plosgff - -BUILDDIR = output/ - -SRCS = httpd.c page_impl.c -OBJS = ${SRCS:%.c=$(BUILDDIR)%.rel} - -all: create_build_dir $(OBJS) - -create_build_dir: - mkdir -p $(BUILDDIR) - -$(BUILDDIR)%.asm: %.c - $(CC) $(CC_FLAGS) -o $@ -c -S $< - -$(BUILDDIR)%.rel: $(BUILDDIR)%.asm - ${ASM} ${AFLAGS} -o $@ $^ - -clean: - rm -r $(BUILDDIR) - -.PHONY: all clean - diff --git a/uip/Makefile b/uip/Makefile deleted file mode 100644 index d275a58..0000000 --- a/uip/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -CC = sdcc -CC_FLAGS = -mmcs51 -I. -I.. -I../httpd -ASM = sdas8051 -AFLAGS= -plosgff - -BUILDDIR = output/ - -SRCS = timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c -OBJS = ${SRCS:%.c=$(BUILDDIR)%.rel} - -all: create_build_dir $(OBJS) - -create_build_dir: - mkdir -p $(BUILDDIR) - -$(BUILDDIR)%.rel: %.c - $(CC) $(CC_FLAGS) -o $@ -c $< - -$(BUILDDIR)%.rel: $(BUILDDIR)%.asm - ${ASM} ${AFLAGS} $^ - -clean: - rm -r $(BUILDDIR) - -.PHONY: all clean -