Makefile: Build fixes

keirf · Jun 4, 2020 · 5950c18 · 5950c18
1 parent 1f75967
commit 5950c18
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,14 @@
 include base/Rules.mk
 
-SUBDIRS := base host_tools overscan testkit inflate
+SUBDIRS := base inflate host_tools overscan testkit inflate
+
+.PHONY: $(SUBDIRS)
 
-.PHONY: all $(SUBDIRS)
 all: $(SUBDIRS)
 
-host_tools overscan testkit:
+overscan testkit: inflate
+
+$(SUBDIRS):
 	$(MAKE) -C $@ all
 
 clean::

diff --git a/base/Makefile b/base/Makefile
@@ -1 +1,3 @@
 include ../base/Rules.mk
+
+all:
diff --git a/base/Rules.mk b/base/Rules.mk
@@ -40,7 +40,7 @@ HOSTCFLAGS += -MMD -MF .$(@F).d
 
 .DEFAULT_GOAL := all
 
-.PHONY: clean
+.PHONY: all clean
 
 .SECONDARY:
 

diff --git a/host_tools/Makefile b/host_tools/Makefile
@@ -2,7 +2,6 @@ include ../base/Rules.mk
 
 TARGETS := hunk_loader kickconv
 
-.PHONY: all
 all: $(TARGETS)
 
 %: %.c

diff --git a/inflate/Makefile b/inflate/Makefile
@@ -22,15 +22,6 @@ test_inflate: degzip test_inflate.o
 	$(CC) -o $@ $@.o $(LDFLAGS)
 	$(PYTHON) test_inflate.py *.[cSo] *.asm ../cracking/protections/* ../cracking/cracks/nzs/gnu_c/* ../testkit/*
 
-.PHONY: a
-a:
-	xdftool ao.adf unpack .
-	$(PYTHON) ./pack_exe.py atlantis1/atlantis foo
-	cp foo atlantis1/atlantis
-	rm -rf a.adf
-	xdftool a.adf pack atlantis1
-	rm -rf atlantis1* foo
-
 %.o: %.S
 	$(CC) -o $@ -c $< $(AFLAGS)
 

diff --git a/overscan/Makefile b/overscan/Makefile
@@ -4,7 +4,6 @@ OBJS += overscan.o
 
 include ../base/Rules.mk
 
-.PHONY: all
 all: overscan.adf
 
 overscan.adf: bootblock.bin overscan.bin

diff --git a/testkit/Makefile b/testkit/Makefile
@@ -24,7 +24,6 @@ include ../base/Rules.mk
 # build.o must be refreshed on every build
 .PHONY: build.c
 
-.PHONY: all
 all: $(NAME)-v$(VER).zip
 
 build.o: CFLAGS += -DVER="\"$(VER)\""
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ include ../base/Rules.mk @@
     TARGETS := hunk_loader kickconv
-    .PHONY: all
     all: $(TARGETS)
     %: %.c
@@ Expand Down @@