Install headers in $prefix/include/$libname

Install each library's headers in $prefix/include/$libname.
The installed headers use #include "lib*/*.h"; applications
are expected to do the same.

Specify only $prefix/include in .pc files.

Originally committed as revision 12194 to svn://svn.ffmpeg.org/ffmpeg/trunk

7 files changed, 19 insertions, 24 deletions

diff --git a/common.mak b/common.mak
index b809748f3e..2ba85157be 100644
--- a/common.mak
+++ b/common.mak
@@ -79,10 +79,12 @@ install-lib-static: $(LIBNAME)
 	install -m 644 $(LIBNAME) "$(LIBDIR)"
 	$(LIB_INSTALL_EXTRA_CMD)
 
+INCINSTDIR = $(INCDIR)/lib$(NAME)
+
 install-headers:
-	install -d "$(INCDIR)"
+	install -d "$(INCINSTDIR)"
 	install -d "$(LIBDIR)/pkgconfig"
-	install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
+	install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCINSTDIR)"
 	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
@@ -95,7 +97,7 @@ uninstall-libs:
 	-rm -f "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::
-	rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
+	rm -f $(addprefix "$(INCINSTDIR)/",$(HEADERS))
 	rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 
 tests: $(TESTS)
diff --git a/configure b/configure
index 72d3831117..02907ebd07 100755
--- a/configure
+++ b/configure
@@ -882,7 +882,7 @@ logfile="config.err"
 PREFIX="/usr/local"
 libdir='$(PREFIX)/lib'
 shlibdir="$libdir"
-incdir='$(PREFIX)/include/ffmpeg'
+incdir='$(PREFIX)/include'
 mandir='$(PREFIX)/share/man'
 bindir='$(PREFIX)/bin'
 
@@ -2130,7 +2130,6 @@ comment=$2
 version=$3
 libs=$4
 requires=$5
-include=$6
 cat <<EOF >$name.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
@@ -2143,7 +2142,7 @@ Version: $version
 Requires: $requires
 Conflicts:
 Libs: -L\${libdir} $libs
-Cflags: -I\${includedir}/$include
+Cflags: -I\${includedir}
 EOF
 }
 
@@ -2158,7 +2157,7 @@ cat <<EOF >$name-uninstalled.pc
 prefix=
 exec_prefix=
 libdir=\${pcfiledir}/$name
-includedir=\${pcfiledir}/$name
+includedir=\${pcfiledir}
 
 Name: $name
 Description: $comment
@@ -2170,27 +2169,27 @@ Cflags: -I\${includedir}
 EOF
 }
 
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
+pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil ""
 pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
 
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version"
 pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
 
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version"
 pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
 
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version"
 pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
 if enabled pp; then
-    pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
+    pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc ""
     pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
 fi
 
 if enabled swscaler; then
-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version"
     pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
 else
-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
     pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
     apply libswscale.pc sed s/^Libs:.*$/Libs:/
     apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e1128e565b..667fe2a31d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -27,7 +27,7 @@
  */
 
 
-#include "avutil.h"
+#include "libavutil/avutil.h"
 #include <sys/types.h> /* size_t */
 
 #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index 284d0b0828..4691d1dfbf 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -27,7 +27,7 @@
  * AVOptions
  */
 
-#include "rational.h"
+#include "libavutil/rational.h"
 
 enum AVOptionType{
     FF_OPT_TYPE_FLAGS,
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 06396eebff..98d7e2e81f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -31,7 +31,7 @@
 
 #include <time.h>
 #include <stdio.h>  /* FILE */
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 #include "avio.h"
 
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index 0d0bfd8bce..8a285c6b0c 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -1,9 +1,6 @@
 
 include ../config.mak
 
-# Overload incdir, postproc include files go in a different directory.
-INCDIR=$(prefix)/include/postproc
-
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 NAME=postproc
@@ -15,6 +12,3 @@ HEADERS = postprocess.h
 OBJS = postprocess.o
 
 include ../common.mak
-
-uninstall-headers::
-	-rmdir "$(prefix)/include/postproc"
diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index b9395c58a8..7739d41eb6 100644
--- a/libpostproc/postprocess.h
+++ b/libpostproc/postprocess.h
@@ -27,7 +27,7 @@
  *     external api for the pp stuff
  */
 
-#include "avutil.h"
+#include "libavutil/avutil.h"
 
 #define LIBPOSTPROC_VERSION_TRIPLET 51,1,0