Merge pull request #10934 from hhromic/fix-git-version

(Makefiles) Fix version_git.o regeneration
This commit is contained in:
Autechre 2020-06-28 19:04:02 +02:00 committed by GitHub
commit 0bac76fbde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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 $@ $<

View File

@ -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 $@ $<