Commit dd66ea8160e79003aa407a423a92899427ea6ffe
1 parent
7398ef88
ar, ranlib
git-svn-id: svn+q:///qpdf/trunk@760 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
4 changed files
with
8 additions
and
6 deletions
autoconf.mk.in
| @@ -18,6 +18,8 @@ LIBS=@LIBS@ | @@ -18,6 +18,8 @@ LIBS=@LIBS@ | ||
| 18 | CPPFLAGS=@CPPFLAGS@ | 18 | CPPFLAGS=@CPPFLAGS@ |
| 19 | CXX=@CXX@ | 19 | CXX=@CXX@ |
| 20 | CXXFLAGS=@CXXFLAGS@ | 20 | CXXFLAGS=@CXXFLAGS@ |
| 21 | +AR=@AR@ | ||
| 22 | +RANLIB=@RANLIB@ | ||
| 21 | GENDEPS=@GENDEPS@ | 23 | GENDEPS=@GENDEPS@ |
| 22 | LIBTOOL=@LIBTOOL@ | 24 | LIBTOOL=@LIBTOOL@ |
| 23 | DOCBOOKX_DTD=@DOCBOOKX_DTD@ | 25 | DOCBOOKX_DTD=@DOCBOOKX_DTD@ |
make/gcc-linux.mk
| @@ -45,8 +45,8 @@ endef | @@ -45,8 +45,8 @@ endef | ||
| 45 | # Usage: $(call makeslib,objs,library) | 45 | # Usage: $(call makeslib,objs,library) |
| 46 | define makeslib | 46 | define makeslib |
| 47 | $(RM) $2 | 47 | $(RM) $2 |
| 48 | - ar cru $(2) $(1) | ||
| 49 | - ranlib $(2) | 48 | + $(AR) cru $(2) $(1) |
| 49 | + $(RANLIB) $(2) | ||
| 50 | endef | 50 | endef |
| 51 | 51 | ||
| 52 | # 1 2 3 4 5 | 52 | # 1 2 3 4 5 |
make/libtool.mk
| @@ -61,8 +61,8 @@ endef | @@ -61,8 +61,8 @@ endef | ||
| 61 | # Usage: $(call makeslib,objs,library) | 61 | # Usage: $(call makeslib,objs,library) |
| 62 | define makeslib | 62 | define makeslib |
| 63 | $(RM) $2 | 63 | $(RM) $2 |
| 64 | - ar cru $(2) $(1) | ||
| 65 | - ranlib $(2) | 64 | + $(AR) cru $(2) $(1) |
| 65 | + $(RANLIB) $(2) | ||
| 66 | endef | 66 | endef |
| 67 | 67 | ||
| 68 | # 1 2 3 4 5 | 68 | # 1 2 3 4 5 |
make/mingw.mk
| @@ -39,8 +39,8 @@ libcompile = $(compile) | @@ -39,8 +39,8 @@ libcompile = $(compile) | ||
| 39 | # Usage: $(call makeslib,objs,library) | 39 | # Usage: $(call makeslib,objs,library) |
| 40 | define makeslib | 40 | define makeslib |
| 41 | $(RM) $2 | 41 | $(RM) $2 |
| 42 | - ar cru $(2) $(1) | ||
| 43 | - ranlib $(2) | 42 | + $(AR) cru $(2) $(1) |
| 43 | + $(RANLIB) $(2) | ||
| 44 | endef | 44 | endef |
| 45 | 45 | ||
| 46 | # 1 2 3 4 5 | 46 | # 1 2 3 4 5 |