From ca9f39b1ea1a274fe1d9c86439daba4a2464490d Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 23 Jul 2010 20:30:43 +0000 Subject: Allow some makefile variables to be overridden on the command line to ease cross compilation. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') 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) -- cgit v1.2.3