Skip to content

Commit

Permalink
[build] Tweaked build dependencies
Browse files Browse the repository at this point in the history
During parallel build, links were being created before the targets,
which didn't seem right, even though it didn't really cause any
issues as long as targets get eventually created.
  • Loading branch information
monich committed Oct 28, 2020
1 parent c188559 commit 93d00a4
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions Makefile
Expand Up @@ -134,9 +134,9 @@ $(COVERAGE_OBJS) $(COVERAGE_STATIC_LIB): | $(COVERAGE_BUILD_DIR)
# Rules
#

debug: $(DEBUG_STATIC_LIB) $(DEBUG_LIB) $(DEBUG_LINK) $(DEBUG_DEV_LINK)
debug: $(DEBUG_STATIC_LIB) $(DEBUG_DEV_LINK)

release: $(RELEASE_STATIC_LIB) $(RELEASE_LIB) $(RELEASE_LINK) $(RELEASE_DEV_LINK)
release: $(RELEASE_STATIC_LIB) $(RELEASE_DEV_LINK)

coverage: $(COVERAGE_STATIC_LIB)

Expand Down Expand Up @@ -187,25 +187,23 @@ $(COVERAGE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c

$(DEBUG_LIB): $(DEBUG_OBJS)
$(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) -o $@
ln -sf $(LIB) $(DEBUG_LINK)

$(RELEASE_LIB): $(RELEASE_OBJS)
$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
ln -sf $(LIB) $(RELEASE_LINK)
ifeq ($(KEEP_SYMBOLS),0)
$(STRIP) $@
endif

$(DEBUG_LINK):
$(DEBUG_LINK): $(DEBUG_LIB)
ln -sf $(LIB) $@

$(RELEASE_LINK):
$(RELEASE_LINK): $(RELEASE_LIB)
ln -sf $(LIB) $@

$(DEBUG_DEV_LINK):
$(DEBUG_DEV_LINK): $(DEBUG_LINK)
ln -sf $(LIB_SYMLINK1) $@

$(RELEASE_DEV_LINK):
$(RELEASE_DEV_LINK): $(RELEASE_LINK)
ln -sf $(LIB_SYMLINK1) $@

$(DEBUG_STATIC_LIB): $(DEBUG_OBJS)
Expand Down

0 comments on commit 93d00a4

Please sign in to comment.