Skip to content

Commit

Permalink
Fix make dist
Browse files Browse the repository at this point in the history
  • Loading branch information
hfiguiere committed May 20, 2013
1 parent 8945e33 commit 69196f9
Show file tree
Hide file tree
Showing 16 changed files with 58 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -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
3 changes: 3 additions & 0 deletions XMPCore/Makefile.am
@@ -0,0 +1,3 @@


SUBDIRS=source
3 changes: 3 additions & 0 deletions XMPFiles/Makefile.am
@@ -0,0 +1,3 @@


SUBDIRS=source
2 changes: 0 additions & 2 deletions XMPFiles/source/NativeMetadataSupport/Makefile.am
Expand Up @@ -54,5 +54,3 @@ libnativemetadata_la_SOURCES = \
MetadataSet.cpp MetadataSet.h \
ValueObject.h \
$(NULL)

EXTRA_DIST=OS_Utils_WIN.cpp OS_Utils_Mac.cpp
4 changes: 4 additions & 0 deletions XMPFilesPlugins/Makefile.am
@@ -0,0 +1,4 @@



SUBDIRS=api PDF_Handler
3 changes: 3 additions & 0 deletions XMPFilesPlugins/PDF_Handler/Makefile.am
@@ -0,0 +1,3 @@


EXTRA_DIST = README.exempi
6 changes: 6 additions & 0 deletions 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.
2 changes: 2 additions & 0 deletions XMPFilesPlugins/api/Makefile.am
@@ -0,0 +1,2 @@

SUBDIRS=source
13 changes: 13 additions & 0 deletions 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)
8 changes: 8 additions & 0 deletions configure.ac
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion exempi/Makefile.am
Expand Up @@ -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

5 changes: 3 additions & 2 deletions 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
Expand Down Expand Up @@ -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)
2 changes: 2 additions & 0 deletions samples/source/Makefile.am
Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions third-party/Makefile.am
@@ -1,2 +1,4 @@

SUBDIRS = zuid/interfaces

DIST_SUBDIRS = zuid/interfaces zlib expat
3 changes: 3 additions & 0 deletions third-party/expat/Makefile.am
@@ -0,0 +1,3 @@


EXTRA_DIST=ReadMe.txt lib/expat.h
3 changes: 3 additions & 0 deletions third-party/zlib/Makefile.am
@@ -0,0 +1,3 @@


EXTRA_DIST=ReadMe.txt zlib.h

0 comments on commit 69196f9

Please sign in to comment.