Ahem. It IS #include <libexif/foo>, not <exif/foo>, after all. Revert hacks and changes

diff --git a/configure.ac b/configure.ac
index 401b542..0e826f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,15 +3,6 @@ AC_INIT([EXIF library],[0.6.14.cvs1],[libexif-devel@lists.sourceforge.net],[libe
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
-AC_CONFIG_COMMANDS_PRE([
-       # Symlink to enable proper #include <exif/foo.h> on uninstalled
-       # libexif source tree. Move the header files once the source
-       # is out of CVS and in SVN, git, bzr, whatever.
-       if test -e "${srcdir}/libexif/exif"; then
-               rm -f "${srcdir}/libexif/exif"
-       fi
-       (cd "${srcdir}/libexif" && ${LN_S} . exif)
-])
 AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 dist-zip check-news])
 
 if test ! -d "$srcdir/m4m"; then

diff --git a/doc/Doxyfile-internals.in b/doc/Doxyfile-internals.in
index a3841f5..7fabc83 100644 (file)
--- a/doc/Doxyfile-internals.in
+++ b/doc/Doxyfile-internals.in
@@ -477,7 +477,7 @@ EXCLUDE                =
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
 # from the input.
 
-EXCLUDE_SYMLINKS       = YES
+EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index f765249..3b7e752 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -477,7 +477,7 @@ EXCLUDE                =
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
 # from the input.
 
-EXCLUDE_SYMLINKS       = YES
+EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 

diff --git a/libexif-uninstalled.pc.in b/libexif-uninstalled.pc.in
index cbd1e97..740615d 100644 (file)
--- a/libexif-uninstalled.pc.in
+++ b/libexif-uninstalled.pc.in
@@ -1,7 +1,5 @@
-# Include stuff requires a system which can do symlinks.
-
 Name: libexif
 Description: Library for easy access to EXIF data
 Version: @VERSION@
 Libs: ${pcfiledir}/libexif/libexif.la
-Cflags: -I${pcfiledir}/@srcdir@/libexif
+Cflags: -I${pcfiledir}/@srcdir@

diff --git a/libexif/exif.h b/libexif/exif.h
index db151f1..31163ed 100644 (file)
--- a/libexif/exif.h
+++ b/libexif/exif.h
@@ -33,10 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * \section using_libexif Using libexif
  *
- * ##include <exif/exif.h>
- *
- * Do not let it confuse you that the source code still contains these
- * include files in its libexif/ subdirectory.
+ * ##include <libexif/exif.h>
  *
  * libexif provides a libexif.pc file for use with pkgconfig. The
  * libexif-uninstalled.pc file probably still needs some work WRT to