Mercurial > hg > dmlib
changeset 2000:07cf888f0a1e
Improve build system slightly.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 03 Jul 2018 09:41:16 +0300 |
| parents | 64730556fd94 |
| children | c0b062f881e5 |
| files | Makefile.gen |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Mon Jul 02 05:05:50 2018 +0300 +++ b/Makefile.gen Tue Jul 03 09:41:16 2018 +0300 @@ -278,6 +278,8 @@ COMPILE_OBJ = @if test ! -d $(OBJPATH); then mkdir -p $(OBJPATH); fi && echo " CC $<" && $(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) LINK_BIN = @if test ! -d $(BINPATH); then mkdir -p $(BINPATH); fi && echo " LINK $@" && $(CC) -o $@ $(filter %.o %.a,$+) +LINK_STATIC_LIB = @echo " AR $@" && $(AR) cru $@ $(filter %.o,$+) && $(RANLIB) $@ + DMLIB_A=$(OBJPATH)dmlib.a DMLIB_OBJS += \ @@ -386,9 +388,7 @@ $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak - @echo " AR $@ $(addprefix $(OBJPATH),$(DMLIB_OBJS))" - @$(AR) cru $@ $(addprefix $(OBJPATH),$(DMLIB_OBJS)) - @$(RANLIB) $@ + $(LINK_STATIC_LIB) ###