aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-06-09 12:44:35 +0000
committerWerner Koch <[email protected]>2009-06-09 12:44:35 +0000
commit621ffc14aed776ec445acbfbfa0075342f2ec869 (patch)
tree7bd0e6bc64ecc11380fab566b5618b64ed0df6c8 /src
parentDefine error code. (diff)
downloadgpgme-621ffc14aed776ec445acbfbfa0075342f2ec869.tar.gz
gpgme-621ffc14aed776ec445acbfbfa0075342f2ec869.zip
Do not distribute gpgme.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.am7
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5d872142..5bd6ca8f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2009-06-09 Werner Koch <[email protected]>
+ * 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 <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index 22254f0c..8906ce72 100644
--- a/src/Makefile.am
+++ b/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 \