avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bru...@apache.org
Subject svn commit: r1065580 - in /avro/trunk: CHANGES.txt lang/c/jansson/Makefile.am lang/c/jansson/src/Makefile.am
Date Mon, 31 Jan 2011 12:29:27 GMT
Author: brucem
Date: Mon Jan 31 12:29:27 2011
New Revision: 1065580

URL: http://svn.apache.org/viewvc?rev=1065580&view=rev
Log:
AVRO-749. Don't install Jansson files.

Our copy of the Jansson library should be strictly internal, but the
autotools build was installing Jansson's include and pkg-config files
along with the Avro library.  Now it doesn't.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/c/jansson/Makefile.am
    avro/trunk/lang/c/jansson/src/Makefile.am

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1065580&r1=1065579&r2=1065580&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Mon Jan 31 12:29:27 2011
@@ -138,6 +138,10 @@ Avro 1.5.0 (unreleased)
     via scottcarey)
 
     AVRO-700. Change C++ build system to CMake (thiru)
+
+    AVRO-749. Don't install Jansson build artifacts. (Douglas Creager via
+    brucem)
+
   BUG FIXES
 
     AVRO-675. C: Bytes and fixed setters don't update datum size.

Modified: avro/trunk/lang/c/jansson/Makefile.am
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/jansson/Makefile.am?rev=1065580&r1=1065579&r2=1065580&view=diff
==============================================================================
--- avro/trunk/lang/c/jansson/Makefile.am (original)
+++ avro/trunk/lang/c/jansson/Makefile.am Mon Jan 31 12:29:27 2011
@@ -3,5 +3,5 @@ SUBDIRS = doc src test
 
 #check-local: html
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = jansson.pc
+#pkgconfigdir = $(libdir)/pkgconfig
+#pkgconfig_DATA = jansson.pc

Modified: avro/trunk/lang/c/jansson/src/Makefile.am
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/jansson/src/Makefile.am?rev=1065580&r1=1065579&r2=1065580&view=diff
==============================================================================
--- avro/trunk/lang/c/jansson/src/Makefile.am (original)
+++ avro/trunk/lang/c/jansson/src/Makefile.am Mon Jan 31 12:29:27 2011
@@ -1,7 +1,8 @@
-include_HEADERS = jansson.h
+#include_HEADERS = jansson.h
 
 noinst_LTLIBRARIES = libjansson.la
 libjansson_la_SOURCES = \
+	jansson.h \
 	dump.c \
 	hashtable.c \
 	hashtable.h \



Mime
View raw message