summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2010-07-23 20:30:43 +0000
committerTor Andersson <tor@ghostscript.com>2010-07-23 20:30:43 +0000
commitca9f39b1ea1a274fe1d9c86439daba4a2464490d (patch)
tree6ed47b7ea74bcf335883f6950a6449c6239bc826 /Makefile
parent231e3938974ea89047a10b3c4eeb605be87fc45d (diff)
downloadmupdf-ca9f39b1ea1a274fe1d9c86439daba4a2464490d.tar.xz
Allow some makefile variables to be overridden on the command line to ease cross compilation.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bade0597..55848975 100644
--- a/Makefile
+++ b/Makefile
@@ -46,14 +46,14 @@ ifneq "$(verbose)" ""
GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-AR_CMD = rm -f $@ && ar cru $@ $^
+AR_CMD = rm -f $@ && $(AR) cru $@ $^
else
GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
LD_CMD = @ echo LD $@ && $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-AR_CMD = @ echo AR $@ && rm -f $@ && ar cru $@ $^
+AR_CMD = @ echo AR $@ && rm -f $@ && $(AR) cru $@ $^
endif
@@ -359,7 +359,7 @@ WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.o) $(WINVIEW_RES:apps/%.rc=$(OBJD
WINVIEW_EXE=$(OBJDIR)/mupdf.exe
$(OBJDIR)/%.o: apps/%.rc
- windres -i $< -o $@ --include-dir=apps
+ $(WINDRES) -i $< -o $@ --include-dir=apps
$(WINVIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR)
$(WINVIEW_EXE): $(WINVIEW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)