makefiles: deduplicate main target name into new PROG var

Put the main target name into a new PROG variable, put PROG into a new
TARGET variable, make "all" depend on `$(TARGET)` and replace every
other occurrence of the main target name with `$(PROG)`.

On the makefiles that build non-shared objects, to make them more
similar.  With this commit, all of their targets are identical (except
for the extra "lib" target on src/lib/Makefile).

1 files changed, 6 insertions, 3 deletions

diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index a7ff45176..5b9356da4 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -1,21 +1,24 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+PROG = fbuilder
+TARGET = $(PROG)
+
 MOD_HDRS = ../include/common.h ../include/syscall.h
 
 .PHONY: all
-all: fbuilder
+all: $(TARGET)
 
 include $(ROOT)/src/common.mk
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fbuilder: $(OBJS) $(ROOT)/config.mk
+$(PROG): $(OBJS) $(ROOT)/config.mk
         $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
-clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist
+clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean