# HG changeset patch # User Matti Hamalainen # Date 1575563533 -7200 # Node ID eaa3e8575c122270b902c85da309b49995cddf3e # Parent 6905d02bca2de2533936b45bd67c5cde70bf052b Build system cleanups. diff -r 6905d02bca2d -r eaa3e8575c12 Makefile.gen --- 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)