From b9fb6c62e914c743aeb6a93532546ae7027f87e4 Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Sun, 28 Jun 2020 17:48:19 +0100 Subject: [PATCH] (Makefiles) Fix version_git.o regeneration Forgotten references to `git_version.c` (nowadays named `version_git.c`) were causing the git version object to not be rebuilt every time. --- Makefile | 4 ++-- Makefile.dingux | 2 +- Makefile.win | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 00e0258c00..669bd55283 100644 --- a/Makefile +++ b/Makefile @@ -217,7 +217,7 @@ $(OBJDIR)/%.o: %.m .FORCE: -$(OBJDIR)/git_version.o: git_version.c .FORCE +$(OBJDIR)/version_git.o: version_git.c .FORCE @mkdir -p $(dir $@) @$(if $(Q), $(shell echo echo CC $<),) $(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $< @@ -233,7 +233,7 @@ $(OBJDIR)/%.o: %.rc $(HEADERS) $(Q)$(WINDRES) -o $@ $< install: $(TARGET) - rm -f $(OBJDIR)/git_version.o + rm -f $(OBJDIR)/version_git.o mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(DATA_DIR)/applications 2>/dev/null || /bin/true diff --git a/Makefile.dingux b/Makefile.dingux index 7b00ae1370..7d3fa9ed36 100644 --- a/Makefile.dingux +++ b/Makefile.dingux @@ -160,7 +160,7 @@ $(OBJDIR)/%.o: %.m .FORCE: -$(OBJDIR)/git_version.o: git_version.c .FORCE +$(OBJDIR)/version_git.o: version_git.c .FORCE @mkdir -p $(dir $@) @$(if $(Q), $(shell echo echo CC $<),) $(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $< diff --git a/Makefile.win b/Makefile.win index b86dda3a92..6fd3137d86 100644 --- a/Makefile.win +++ b/Makefile.win @@ -162,7 +162,7 @@ $(OBJDIR)/%.o: %.c .FORCE: -$(OBJDIR)/git_version.o: git_version.c .FORCE +$(OBJDIR)/version_git.o: version_git.c .FORCE @-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo . @$(if $(Q), $(shell echo echo CC $<),) $(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<