diff options
| author | Hubert Figuière <hub@figuiere.net> | 2013-05-14 18:54:10 -0400 |
|---|---|---|
| committer | Hubert Figuière <hub@figuiere.net> | 2013-05-14 20:25:20 -0400 |
| commit | f27e317d9f722d74895ad8ba0da1b3d3d81b0f76 (patch) | |
| tree | e9ee3d18d09c9a1c2a3a90b84e53accb1a4ad793 /Makefile.am | |
| parent | 82aa3670838622e6ee645ebecfe2abd93ec56836 (diff) | |
| parent | 81a4c6bcb1879cb321246590faca595e9746f8e5 (diff) | |
Merge branch 'adobe-sdk' into cs6-integration
This bring the CS6 version of the SDK to Exempi
Adapt the build system.
GIF support is currently disabled.
Conflicts:
XMPCore/source/XMPCore_Impl.hpp
XMPFiles/source/FileHandlers/AVCHD_Handler.cpp
XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
XMPFiles/source/FileHandlers/P2_Handler.cpp
XMPFiles/source/FileHandlers/PSD_Handler.hpp
XMPFiles/source/FileHandlers/PostScript_Handler.cpp
XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp
XMPFiles/source/FileHandlers/UCF_Handler.hpp
XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp
XMPFiles/source/FileHandlers/XDCAM_Handler.cpp
XMPFiles/source/FormatSupport/PSIR_Support.hpp
XMPFiles/source/XMPFiles.hpp
XMPFiles/source/XMPFiles_Impl.cpp
XMPFiles/source/XMPFiles_Impl.hpp
samples/source/common/DumpFile.cpp
samples/source/common/LargeFileAccess.cpp
samples/source/common/LargeFileAccess.hpp
samples/source/common/Log.cpp
source/XMPFiles/FormatSupport/ID3_Support.hpp
source/XMPFiles/XMPFiles.cpp
source/XMP_LibUtils.cpp
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 47e12ac..0530f05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # # exempi - Makefile.am # -# Copyright (C) 2007 Hubert Figuiere +# Copyright (C) 2007-2013 Hubert Figuiere # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = third-party source samples exempi +SUBDIRS = third-party source XMPCore/source XMPFiles/source samples exempi DIST_SUBDIRS = build third-party source samples exempi public EXTRA_DIST = autogen.sh |