changeset 41:eaa3e8575c12

Build system cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2019 18:32:13 +0200
parents 6905d02bca2d
children 3c7e1d3fa5a2
files Makefile.gen
diffstat 1 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Thu Dec 05 16:59:20 2019 +0200
+++ b/Makefile.gen	Thu Dec 05 18:32:13 2019 +0200
@@ -6,13 +6,6 @@
 MKDIR_P ?= $(MKDIR) -p
 BINPATH ?= ./
 
-TARGETS = gldragon$(BINEXT) ply2bin$(BINEXT)
-NOBUILD_TARGETS +=
-NOINST_TARGETS += 
-CLEAN_TARGETS +=
-DISTCLEAN_TARGETS += 
-
-
 ifneq ($(V),1)
 COMPILE_C_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo " CC $<" && $(CC) $(CFLAGS) -c -o $@ $<
 COMPILE_CXX_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo " CXX $<" && $(CXX) $(CXXFLAGS) -c -o $@ $<
@@ -27,6 +20,16 @@
 LINK_STATIC_LIB = @echo "$(AR) cru $@ $(filter %.o,$+)" && $(AR) cru $@ $(filter %.o,$+) && echo "$(RANLIB) $@" && $(RANLIB) $@
 endif
 
+BINARIES = gldragon ply2bin
+
+TARGETS += \
+	$(addprefix $(BINPATH),$(addsuffix $(BINEXT),$(BINARIES)))
+
+NOBUILD_TARGETS +=
+NOINST_TARGETS += 
+CLEAN_TARGETS +=
+DISTCLEAN_TARGETS += 
+
 
 ###
 ### Target rules
@@ -41,10 +44,10 @@
 	$(COMPILE_CXX_OBJ)
 
 
-gldragon$(BINEXT): $(OBJPATH)gldragon.o $(OBJPATH)dmmodel.o $(OBJPATH)dmutil.o
+$(BINPATH)gldragon$(BINEXT): $(addprefix $(OBJPATH), gldragon.o dmmodel.o dmutil.o)
 	$(LINK_CXX_BIN) $(LDFLAGS) $(SDL_LDFLAGS) $(GL_LDFLAGS)
 
-ply2bin$(BINEXT): $(OBJPATH)ply2bin.o $(OBJPATH)dmmodel.o $(OBJPATH)dmutil.o
+$(BINPATH)ply2bin$(BINEXT): $(addprefix $(OBJPATH), ply2bin.o dmmodel.o dmutil.o)
 	$(LINK_CXX_BIN) $(LDFLAGS) $(TOOL_LDFLAGS)