[x264-devel] [PATCH] Buils system

[Christophe Mutricy]

Hiya,

Just a small patch to allow the user to set ar and ranlib in config.mak
when he is in strange situation ( in my case compiling for win32 on a
amd64 linux).



-- 
Xtophe
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 336)
+++ configure	(working copy)
@@ -45,6 +45,9 @@
 
 EXE=""
 
+AR="ar rc"
+RANLIB="ranlib"
+
 UNAMES="`uname -s`"
 case "$UNAMES" in
   BeOS)
@@ -253,6 +256,8 @@
 ASFLAGS=$ASFLAGS
 VFW=$vfw
 EXE=$EXE
+AR=$AR
+RANLIB=$RANLIB
 VIS=$vis
 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
 EOF
Index: Makefile
===================================================================
--- Makefile	(revision 336)
+++ Makefile	(working copy)
@@ -60,8 +60,8 @@
 default: $(DEP) x264$(EXE)
 
 libx264.a: .depend $(OBJS) $(OBJASM)
-	ar rc libx264.a $(OBJS) $(OBJASM)
-	ranlib libx264.a
+	$(AR) libx264.a $(OBJS) $(OBJASM)
+	$(RANLIB) libx264.a
 
 x264$(EXE): libx264.a x264.o matroska.o
 	$(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
@@ -96,12 +96,12 @@
 distclean: clean
 	rm -f config.mak vfw/build/cygwin/config.mak
 
-install: x264
+install: x264$(EXE)
 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
 	install -m 644 x264.h $(DESTDIR)$(includedir)
 	install -m 644 libx264.a $(DESTDIR)$(libdir)
-	install x264 $(DESTDIR)$(bindir)
-	ranlib $(DESTDIR)$(libdir)/libx264.a
+	install x264$(EXE) $(DESTDIR)$(bindir)
+	$(RANLIB) $(DESTDIR)$(libdir)/libx264.a
 
 etags: TAGS