couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1089158 - in /couchdb/trunk: license.skip src/Makefile.am src/ejson/ src/ejson/Makefile.am
Date Tue, 05 Apr 2011 18:58:43 GMT
Author: davisp
Date: Tue Apr  5 18:58:42 2011
New Revision: 1089158

URL: http://svn.apache.org/viewvc?rev=1089158&view=rev
Log:
Tweaks to the ejson build system.

Fixes make distcheck.
The local copy of src/ejson/priv/ejson.so works
better.
General clean up of src/ejson/Makefile.am


Modified:
    couchdb/trunk/license.skip
    couchdb/trunk/src/Makefile.am
    couchdb/trunk/src/ejson/   (props changed)
    couchdb/trunk/src/ejson/Makefile.am

Modified: couchdb/trunk/license.skip
URL: http://svn.apache.org/viewvc/couchdb/trunk/license.skip?rev=1089158&r1=1089157&r2=1089158&view=diff
==============================================================================
--- couchdb/trunk/license.skip (original)
+++ couchdb/trunk/license.skip Tue Apr  5 18:58:42 2011
@@ -83,6 +83,7 @@
 ^src/couchdb/priv/couchspawnkillable
 ^src/couchdb/priv/stat_descriptions.cfg
 ^src/erlang-oauth/*
+^src/ejson/*
 ^src/etap/*
 ^src/ibrowse/*
 ^src/mochiweb/*

Modified: couchdb/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/Makefile.am?rev=1089158&r1=1089157&r2=1089158&view=diff
==============================================================================
--- couchdb/trunk/src/Makefile.am (original)
+++ couchdb/trunk/src/Makefile.am Tue Apr  5 18:58:42 2011
@@ -10,4 +10,4 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb ejson
+SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb

Propchange: couchdb/trunk/src/ejson/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr  5 18:58:42 2011
@@ -0,0 +1,6 @@
+*.app
+*.beam
+priv
+.deps
+Makefile
+Makefile.in

Modified: couchdb/trunk/src/ejson/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/Makefile.am?rev=1089158&r1=1089157&r2=1089158&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/Makefile.am (original)
+++ couchdb/trunk/src/ejson/Makefile.am Tue Apr  5 18:58:42 2011
@@ -13,13 +13,22 @@
 ejsonebindir = $(localerlanglibdir)/ejson-0.1.0/ebin
 ejsonprivdir = $(localerlanglibdir)/ejson-0.1.0/priv
 
+EXTRA_DIST =  \
+    erl_nif_compat.h \
+    yajl/yajl_alloc.h \
+    yajl/yajl_buf.h \
+    yajl/yajl_bytestack.h \
+    yajl/yajl_common.h \
+    yajl/yajl_encode.h \
+    yajl/yajl_gen.h \
+    yajl/yajl_lex.h \
+    yajl/yajl_parse.h \
+    yajl/yajl_parser.h
+
 CLEANFILES = \
     $(ejsonebin_make_generated_file_list) \
-    $(ejsonpriv_make_generated_file_list)
-
-if USE_OTP_NIFS
-ejsonpriv_LTLIBRARIES = ejson.la
-endif
+    $(ejsonpriv_make_generated_file_list) \
+    priv/ejson.so
 
 EJSON_C_SRCS = \
 	ejson.c \
@@ -33,15 +42,6 @@ EJSON_C_SRCS = \
 	yajl/yajl_lex.c \
 	yajl/yajl_parser.c
 
-if USE_OTP_NIFS
-ejson_la_SOURCES = $(EJSON_C_SRCS)
-ejson_la_LDFLAGS = -module -avoid-version
-
-if WINDOWS
-ejson_la_LDFLAGS += -no-undefined
-endif
-endif
-
 ejson_file_collection = \
     ejson.app.in \
     ejson.erl \
@@ -58,23 +58,19 @@ ejsonebin_make_generated_file_list = \
 ejsonebin_DATA = \
     $(ejsonebin_make_generated_file_list)
 
-EXTRA_DIST =  \
-    $(ejson_file_collection) \
-    erl_nif_compat.h \
-    yajl/yajl_alloc.h \
-    yajl/yajl_buf.h \
-    yajl/yajl_bytestack.h \
-    yajl/yajl_common.h \
-    yajl/yajl_encode.h \
-    yajl/yajl_gen.h \
-    yajl/yajl_lex.h \
-    yajl/yajl_parse.h \
-    yajl/yajl_parser.h \
-    priv
-
 if USE_OTP_NIFS
-priv/ejson.so: .libs/ejson.so
-	$(LN_S) .libs priv
+ejsonpriv_LTLIBRARIES = ejson.la
+
+ejson_la_SOURCES = $(EJSON_C_SRCS)
+ejson_la_LDFLAGS = -module -avoid-version
+
+if WINDOWS
+ejson_la_LDFLAGS += -no-undefined
+endif
+
+priv/ejson.so: ejson.la
+	@mkdir -p ./priv
+	cp .libs/ejson.so $@
 
 all: priv/ejson.so
 endif



Mime
View raw message