Merge branch 'master' of git@github.com:planetbeing/libdmg-hfsplus
This commit is contained in:
Коммит
d35792981f
|
@ -65,8 +65,10 @@ PEX_LIBS=
|
|||
EX_LIBS=
|
||||
EXE_EXT=
|
||||
ARFLAGS=
|
||||
AR=ar $(ARFLAGS) r
|
||||
RANLIB= /usr/bin/ranlib
|
||||
AR?=ar
|
||||
AR_EX:=$(AR)
|
||||
AR= $(AR_EX) $(ARFLAGS) r
|
||||
RANLIB ?= /usr/bin/ranlib
|
||||
PERL= /usr/bin/perl
|
||||
TAR= tar
|
||||
TARFLAGS= --no-recursion
|
||||
|
|
|
@ -11,7 +11,7 @@ MAKEDEPPROG= makedepend
|
|||
MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
|
||||
MAKEFILE= Makefile
|
||||
RM= rm -f
|
||||
AR= ar r
|
||||
AR?= ar r
|
||||
|
||||
RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \
|
||||
(cd $$i && echo "making $$target in $(DIR)/$$i..." && \
|
||||
|
|
|
@ -33,8 +33,8 @@ SHAREDLIB=libz.so
|
|||
SHAREDLIBV=libz.so.1.2.3
|
||||
SHAREDLIBM=libz.so.1
|
||||
|
||||
AR=ar rc
|
||||
RANLIB=ranlib
|
||||
AR?=ar
|
||||
RANLIB?=ranlib
|
||||
TAR=tar
|
||||
SHELL=/bin/sh
|
||||
EXE=
|
||||
|
@ -68,7 +68,7 @@ test: all
|
|||
fi
|
||||
|
||||
libz.a: $(OBJS) $(OBJA)
|
||||
$(AR) $@ $(OBJS) $(OBJA)
|
||||
$(AR) rc $@ $(OBJS) $(OBJA)
|
||||
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
|
||||
|
||||
match.o: match.S
|
||||
|
|
Загрузка…
Ссылка в новой задаче