You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/12 07:23:18 UTC
[08/15] snappy commit: updated refs/heads/import-master to 64cd135
Minor cleanup to the snappy Makefile.am
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1099105 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/commit/c1dcd82a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/tree/c1dcd82a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/diff/c1dcd82a
Branch: refs/heads/import-master
Commit: c1dcd82af038782158356931c7c3bd81f9ef812d
Parents: 183247c
Author: Paul Joseph Davis <da...@apache.org>
Authored: Tue May 3 15:59:54 2011 +0000
Committer: Paul Joseph Davis <da...@apache.org>
Committed: Tue May 3 15:59:54 2011 +0000
----------------------------------------------------------------------
Makefile.am | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-snappy/blob/c1dcd82a/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 4a12631..e41a616 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 $@