Fix make dist

16 files changed, 58 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 0530f05..2fdee08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = third-party source XMPCore/source XMPFiles/source samples exempi
-DIST_SUBDIRS = build third-party source samples exempi public
+SUBDIRS = third-party source XMPCore XMPFiles samples exempi
+DIST_SUBDIRS = build third-party source XMPCore XMPFiles XMPFilesPlugins samples exempi public
 
 EXTRA_DIST = autogen.sh
diff --git a/XMPCore/Makefile.am b/XMPCore/Makefile.am
new file mode 100644
index 0000000..525e2e5
--- /dev/null
+++ b/XMPCore/Makefile.am
@@ -0,0 +1,3 @@
+
+
+SUBDIRS=source
diff --git a/XMPFiles/Makefile.am b/XMPFiles/Makefile.am
new file mode 100644
index 0000000..525e2e5
--- /dev/null
+++ b/XMPFiles/Makefile.am
@@ -0,0 +1,3 @@
+
+
+SUBDIRS=source
diff --git a/XMPFiles/source/NativeMetadataSupport/Makefile.am b/XMPFiles/source/NativeMetadataSupport/Makefile.am
index 6d8e097..7f0165c 100644
--- a/XMPFiles/source/NativeMetadataSupport/Makefile.am
+++ b/XMPFiles/source/NativeMetadataSupport/Makefile.am
@@ -54,5 +54,3 @@ libnativemetadata_la_SOURCES = \
 	MetadataSet.cpp MetadataSet.h \
 	ValueObject.h \
 	$(NULL)
-
-EXTRA_DIST=OS_Utils_WIN.cpp OS_Utils_Mac.cpp
diff --git a/XMPFilesPlugins/Makefile.am b/XMPFilesPlugins/Makefile.am
new file mode 100644
index 0000000..24fd3a6
--- /dev/null
+++ b/XMPFilesPlugins/Makefile.am
@@ -0,0 +1,4 @@
+
+
+
+SUBDIRS=api PDF_Handler
diff --git a/XMPFilesPlugins/PDF_Handler/Makefile.am b/XMPFilesPlugins/PDF_Handler/Makefile.am
new file mode 100644
index 0000000..310146c
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/Makefile.am
@@ -0,0 +1,3 @@
+
+
+EXTRA_DIST = README.exempi
diff --git a/XMPFilesPlugins/PDF_Handler/README.exempi b/XMPFilesPlugins/PDF_Handler/README.exempi
new file mode 100644
index 0000000..f5fceac
--- /dev/null
+++ b/XMPFilesPlugins/PDF_Handler/README.exempi
@@ -0,0 +1,6 @@
+This directory usually contains a proprietary PDF Handler
+written by Adobe. There is no source code.
+
+It has been omitted from the Exempi tarball.
+
+Check the source code repository.
\ No newline at end of file
diff --git a/XMPFilesPlugins/api/Makefile.am b/XMPFilesPlugins/api/Makefile.am
new file mode 100644
index 0000000..57fb028
--- /dev/null
+++ b/XMPFilesPlugins/api/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS=source
diff --git a/XMPFilesPlugins/api/source/Makefile.am b/XMPFilesPlugins/api/source/Makefile.am
new file mode 100644
index 0000000..ece8912
--- /dev/null
+++ b/XMPFilesPlugins/api/source/Makefile.am
@@ -0,0 +1,13 @@
+
+
+EXTRA_DIST = HostAPIAccess.cpp \
+	HostAPIAccess.h\
+	HostAPI.h\
+	PluginAPIImpl.cpp\
+	PluginBase.cpp\
+	PluginBase.h\
+	PluginConst.h\
+	PluginHandler.h\
+	PluginRegistry.cpp\
+	PluginRegistry.h\
+	$(NULL)
diff --git a/configure.ac b/configure.ac
index 3219cfd..eac3736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,13 +205,21 @@ AC_OUTPUT([
 Makefile
 third-party/Makefile
 third-party/zuid/interfaces/Makefile
+third-party/zlib/Makefile
+third-party/expat/Makefile
 source/Makefile
+XMPCore/Makefile
 XMPCore/source/Makefile
+XMPFiles/Makefile
 XMPFiles/source/Makefile
 XMPFiles/source/FileHandlers/Makefile
 XMPFiles/source/FormatSupport/Makefile
 XMPFiles/source/NativeMetadataSupport/Makefile
 XMPFiles/source/PluginHandler/Makefile
+XMPFilesPlugins/Makefile
+XMPFilesPlugins/api/Makefile
+XMPFilesPlugins/api/source/Makefile
+XMPFilesPlugins/PDF_Handler/Makefile
 samples/Makefile
 samples/source/Makefile
 samples/testfiles/Makefile
diff --git a/exempi/Makefile.am b/exempi/Makefile.am
index 553361a..29ecd00 100644
--- a/exempi/Makefile.am
+++ b/exempi/Makefile.am
@@ -66,7 +66,7 @@ if HAVE_SYMBOLS_FILE
 libexempi_la_LDFLAGS += -Wl,--retain-symbols-file=$(srcdir)/libexempi.sym
 endif
 
-man_MANS = exempi.1
+dist_man1_MANS = exempi.1
 
 EXTRA_DIST = libexempi.sym
 
diff --git a/public/include/Makefile.am b/public/include/Makefile.am
index 1f51204..866c7f9 100644
--- a/public/include/Makefile.am
+++ b/public/include/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
@@ -38,12 +38,13 @@
 DIST_SUBDIRS = client-glue
 
 xmpdir = $(includedir)/@EXEMPI_INCLUDE_BASE@
-xmp_HEADERS = 
+xmp_HEADERS =
 
 noinst_HEADERS = TXMPFiles.hpp  TXMPIterator.hpp \
 	TXMPMeta.hpp  TXMPUtils.hpp \
 	XMP.hpp  XMP_Version.h\
 	XMP.incl_cpp\
 	XMP_Const.h XMP_Environment.h \
+	XMP_IO.hpp \
 	XMP_UnixEndian.h \
 	$(NULL)
diff --git a/samples/source/Makefile.am b/samples/source/Makefile.am
index 04ebc23..26af156 100644
--- a/samples/source/Makefile.am
+++ b/samples/source/Makefile.am
@@ -58,6 +58,8 @@ noinst_LTLIBRARIES = libsamplescommon.la
 libsamplescommon_la_SOURCES = common/DumpFile.cpp common/DumpFile.h \
 	common/Log.cpp common/Log.h \
 	common/TagTree.cpp common/TagTree.h \
+	common/LargeFileAccess.hpp \
+	common/XMPScanner.hpp \
 	common/globals.h \
 	$(NULL)
 
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index a14ed76..211ebcf 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -1,2 +1,4 @@
 
 SUBDIRS = zuid/interfaces
+
+DIST_SUBDIRS = zuid/interfaces zlib expat
diff --git a/third-party/expat/Makefile.am b/third-party/expat/Makefile.am
new file mode 100644
index 0000000..c6f44fb
--- /dev/null
+++ b/third-party/expat/Makefile.am
@@ -0,0 +1,3 @@
+
+
+EXTRA_DIST=ReadMe.txt lib/expat.h
diff --git a/third-party/zlib/Makefile.am b/third-party/zlib/Makefile.am
new file mode 100644
index 0000000..3e40bb2
--- /dev/null
+++ b/third-party/zlib/Makefile.am
@@ -0,0 +1,3 @@
+
+
+EXTRA_DIST=ReadMe.txt zlib.h