couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1099105 - /couchdb/trunk/src/snappy/Makefile.am
Date Tue, 03 May 2011 15:59:54 GMT
Author: davisp
Date: Tue May  3 15:59:54 2011
New Revision: 1099105

URL: http://svn.apache.org/viewvc?rev=1099105&view=rev
Log:
Minor cleanup to the snappy Makefile.am


Modified:
    couchdb/trunk/src/snappy/Makefile.am

Modified: couchdb/trunk/src/snappy/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/snappy/Makefile.am?rev=1099105&r1=1099104&r2=1099105&view=diff
==============================================================================
--- couchdb/trunk/src/snappy/Makefile.am (original)
+++ couchdb/trunk/src/snappy/Makefile.am Tue May  3 15:59:54 2011
@@ -13,22 +13,13 @@
 snappyebindir = $(localerlanglibdir)/snappy-1.0.1/ebin
 snappyprivdir = $(localerlanglibdir)/snappy-1.0.1/priv
 
-CLEANFILES = \
-	$(snappyebin_make_generated_file_list) \
-	$(snappypriv_make_generated_file_list) \
-	priv/snappy_nif.so
-
-if USE_OTP_NIFS
-snappypriv_LTLIBRARIES = snappy_nif.la
-endif
-
-SNAPPY_CXX_SRCS = \
+snappy_cxx_srcs = \
 	snappy_nif.cc \
 	google-snappy/snappy.cc \
 	google-snappy/snappy-sinksource.cc \
 	google-snappy/snappy-stubs-internal.cc
 
-SNAPPY_CXX_HDRS = \
+snappy_cxx_hdrs = \
 	erl_nif_compat.h \
 	google-snappy/snappy.h \
 	google-snappy/snappy-internal.h \
@@ -36,15 +27,6 @@ SNAPPY_CXX_HDRS = \
 	google-snappy/snappy-stubs-internal.h \
 	google-snappy/snappy-stubs-public.h
 
-if USE_OTP_NIFS
-snappy_nif_la_SOURCES = $(SNAPPY_CXX_SRCS)
-snappy_nif_la_LDFLAGS = -module -avoid-version
-
-if WINDOWS
-snappy_nif_la_LDFLAGS += -no-undefined
-endif
-endif
-
 snappy_file_collection = \
     snappy.app.in \
     snappy.erl
@@ -54,13 +36,25 @@ snappyebin_make_generated_file_list = \
     snappy.beam
 
 EXTRA_DIST = \
-	$(SNAPPY_CXX_HDRS) \
-	$(snappy_file_collection)
+	$(snappy_cxx_hdrs) \
+    $(snappy_file_collection)
+
+CLEANFILES = \
+    $(snappyebin_make_generated_file_list) \
+	priv/snappy_nif.so
 
 snappyebin_DATA = \
     $(snappyebin_make_generated_file_list)
 
 if USE_OTP_NIFS
+snappypriv_LTLIBRARIES = snappy_nif.la
+snappy_nif_la_SOURCES = $(snappy_cxx_srcs)
+snappy_nif_la_LDFLAGS = -module -avoid-version
+
+if WINDOWS
+snappy_nif_la_LDFLAGS += -no-undefined
+endif
+
 priv/snappy_nif.so: snappy_nif.la
 	@mkdir -p ./priv
 	cp .libs/snappy_nif.so $@



Mime
View raw message