Do not distribute gpgme.h.

diff --git a/trunk/src/ChangeLog b/trunk/src/ChangeLog
index 5d87214270182840cb1a65806708036369aa76de..5bd6ca8f577599fe8c804d9a5a51dcc5d2e109c6 100644 (file)
--- a/trunk/src/ChangeLog
+++ b/trunk/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-09  Werner Koch  <wk@g10code.com>
 
+       * Makefile.am (main_sources): Remove gpgme.h.
+       (include_HEADERS): Rename to nodist_include_HEADERS so that a
+       VPATH build won't use the distributed one.
+
        * util.h (GPG_ERR_NOT_OPERATIONAL): Define.
 
 2009-05-28  Marcus Brinkmann  <marcus@g10code.de>

diff --git a/trunk/src/Makefile.am b/trunk/src/Makefile.am
index 22254f0cdeade0882ab3a328a6fffc5b99c37bfb..8906ce72286f9cfa8f26d1fb7a28757828f44c77 100644 (file)
--- a/trunk/src/Makefile.am
+++ b/trunk/src/Makefile.am
@@ -14,8 +14,7 @@
 # Public License for more details.
 # 
 # You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
@@ -27,7 +26,7 @@ MOSTLYCLEANFILES = status-table.h
 bin_SCRIPTS = gpgme-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gpgme.m4
-include_HEADERS = gpgme.h
+nodist_include_HEADERS = gpgme.h
 
 if HAVE_PTHREAD
 ltlib_gpgme_pthread = libgpgme-pthread.la
@@ -95,7 +94,7 @@ endif
 # right linking order with libtool, as the non-installed version has
 # unresolved symbols to the thread module.
 main_sources =                                                         \
-       gpgme.h util.h conversion.c get-env.c context.h ops.h           \
+       util.h conversion.c get-env.c context.h ops.h                   \
        data.h data.c data-fd.c data-stream.c data-mem.c data-user.c    \
        data-compat.c                                                   \
        signers.c sig-notation.c                                        \