[svn] gpgme - r1371 - trunk/src

[svn author wk]

Author: wk
Date: 2009-06-09 14:44:35 +0200 (Tue, 09 Jun 2009)
New Revision: 1371

Modified:
   trunk/src/ChangeLog
   trunk/src/Makefile.am
Log:
Do not distribute gpgme.h.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-06-09 12:13:28 UTC (rev 1370)
+++ trunk/src/ChangeLog	2009-06-09 12:44:35 UTC (rev 1371)
@@ -1,5 +1,9 @@
 2009-06-09  Werner Koch  <wk at 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 at g10code.de>

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-06-09 12:13:28 UTC (rev 1370)
+++ trunk/src/Makefile.am	2009-06-09 12:44:35 UTC (rev 1371)
@@ -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 @@
 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 @@
 # 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					\