diff --git a/Makefile b/Makefile index fb7b85c94ce4c1f02319f43f9469684a49afd987..65b93c41984ef49e2afb0d18035346980f0e1fba 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ include .depend endif clean: - rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS + rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS x264.pc rm -f checkasm checkasm.exe tools/checkasm.o rm -f tools/avc2avi tools/avc2avi.exe tools/avc2avi.o rm -rf vfw/build/cygwin/bin @@ -101,12 +101,19 @@ distclean: clean rm -f config.mak vfw/build/cygwin/config.mak install: x264 - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) + install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.h $(DESTDIR)$(includedir) install -m 644 libx264.a $(DESTDIR)$(libdir) + install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install x264 $(DESTDIR)$(bindir) ranlib $(DESTDIR)$(libdir)/libx264.a +.PHONY: uninstall +uninstall: + rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a + rm -f $(DESTDIR)$(bindir)/x264 $(DESTDIR)$(libdir)/pkgconfig/x264.pc + etags: TAGS TAGS: diff --git a/configure b/configure index d829670ff0a57987681c9fcd128326d02f7854b8..943ea2cf39d547588f8eefc7298827b44af02b3a 100755 --- a/configure +++ b/configure @@ -22,9 +22,9 @@ exit 1 fi prefix='/usr/local' -eprefix='${prefix}' -bindir='${eprefix}/bin' -libdir='${eprefix}/lib' +exec_prefix='${prefix}' +bindir='${exec_prefix}/bin' +libdir='${exec_prefix}/lib' includedir='${prefix}/include' avis_input="no" @@ -162,7 +162,7 @@ for opt do prefix="$optarg" ;; --exec-prefix=*) - eprefix="$optarg" + exec_prefix="$optarg" ;; --bindir=*) bindir="$optarg" @@ -243,7 +243,7 @@ fi rm -f config.mak cat > config.mak << EOF prefix=$prefix -eprefix=$eprefix +exec_prefix=$exec_prefix bindir=$bindir libdir=$libdir includedir=$includedir @@ -269,6 +269,22 @@ EOF echo "default: x264vfw.dll" >> config.mak fi +# x264.pc file creation +rm -f x264.pc +cat > x264.pc << EOF +prefix=$prefix +exec_prefix=$exec_prefix +libdir=$libdir +includedir=$includedir + +Name: x264 +Description: H.264 (MPEG4 AVC) encoder library +Version: +Libs: -L$libdir -lx264 +Cflags: -I$includedir +EOF + + echo "Platform: $ARCH" echo "System: $SYS" echo "avis input: $avis_input"