2 ===================================================================
3 --- configure (revision 612)
4 +++ configure (working copy)
9 -CFLAGS="-Wall -I. -D__X264__"
11 +CFLAGS="$CFLAGS -Wall -I. -D__X264__"
24 MACHINE="$(./config.guess)"
35 + RANLIB="$CROSS-ranlib"
36 + MACHINE="`echo $CROSS | sed -e 's/-/-x-/g'`"
42 + exec_prefix="$optarg"
51 + includedir="$optarg"
53 + --enable-avis-input)
56 + --disable-avis-input)
59 + --enable-mp4-output)
62 + --disable-mp4-output)
66 + ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
69 + CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
72 + LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
84 + CFLAGS="$CFLAGS -pg"
85 + LDFLAGS="$LDFLAGS -pg"
99 + if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
103 + --enable-visualize)
104 + LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
105 + CFLAGS="$CFLAGS -DVISUALIZE=1"
109 + echo "Unknown option $opt, ignored"
115 case "${MACHINE#*-*-}" in
121 CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
132 - exec_prefix="$optarg"
141 - includedir="$optarg"
143 - --enable-avis-input)
146 - --disable-avis-input)
149 - --enable-mp4-output)
152 - --disable-mp4-output)
156 - ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
159 - CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
162 - LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
165 - pthread="auto" # can't skip detection, since it differs by OS
174 - CFLAGS="$CFLAGS -pg"
175 - LDFLAGS="$LDFLAGS -pg"
189 - if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
193 - --enable-visualize)
194 - LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
195 - CFLAGS="$CFLAGS -DVISUALIZE=1"
199 - echo "Unknown option $opt, ignored"
204 # autodetect options that weren't forced nor disabled
215 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
218 ===================================================================
219 --- Makefile (revision 590)
220 +++ Makefile (working copy)
222 default: $(DEP) x264$(EXE)
224 libx264.a: .depend $(OBJS) $(OBJASM)
225 - ar rc libx264.a $(OBJS) $(OBJASM)
227 + $(AR) rc libx264.a $(OBJS) $(OBJASM)
228 + $(RANLIB) libx264.a
230 $(SONAME): .depend $(OBJS) $(OBJASM)
231 $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
232 @@ -138,14 +138,14 @@
233 rm -f config.mak config.h x264.pc
234 $(MAKE) -C gtk distclean
236 -install: x264 $(SONAME)
238 install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
239 install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
240 install -m 644 x264.h $(DESTDIR)$(includedir)
241 install -m 644 libx264.a $(DESTDIR)$(libdir)
242 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
243 - install x264 $(DESTDIR)$(bindir)
244 - ranlib $(DESTDIR)$(libdir)/libx264.a
245 + install x264$(EXE) $(DESTDIR)$(bindir)
246 + $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
247 $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
248 $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))