svn commit: r940326 - in /incubator/thrift/trunk: configure.ac lib/erl/Makefile lib/erl/Makefile.am

[br...@apache.org]

Author: bryanduxbury
Date: Sun May  2 22:54:22 2010
New Revision: 940326

URL: http://svn.apache.org/viewvc?rev=940326&view=rev
Log:
THRIFT-646. erl: Erlang library is missing install target

This patch adds a new install target to the erlang makefile. It also converts the Makefile to Makefile.am

Patch: Anthony Molinaro

Added:
    incubator/thrift/trunk/lib/erl/Makefile.am
Removed:
    incubator/thrift/trunk/lib/erl/Makefile
Modified:
    incubator/thrift/trunk/configure.ac

Modified: incubator/thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=940326&r1=940325&r2=940326&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Sun May  2 22:54:22 2010
@@ -259,6 +259,7 @@ AC_CONFIG_FILES([
   lib/cpp/thrift-nb.pc
   lib/cpp/thrift-z.pc
   lib/csharp/Makefile
+  lib/erl/Makefile
   lib/java/Makefile
   lib/perl/Makefile
   lib/perl/test/Makefile

Added: incubator/thrift/trunk/lib/erl/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/Makefile.am?rev=940326&view=auto
==============================================================================
--- incubator/thrift/trunk/lib/erl/Makefile.am (added)
+++ incubator/thrift/trunk/lib/erl/Makefile.am Sun May  2 22:54:22 2010
@@ -0,0 +1,57 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# directory where erlang library code should live
+ERL_LIB_ROOT_DIR=$(shell erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell)
+
+MODULES = \
+	src
+
+all clean docs:
+	for dir in $(MODULES); do \
+		(cd $$dir; ${MAKE} $@); \
+	done
+
+ERLLIBDIR=$(DESTDIR)$(ERL_LIB_ROOT_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+
+install: all
+	mkdir -p $(ERLLIBDIR) ; \
+	mkdir -p $(ERLLIBDIR)/ebin ; \
+	mkdir -p $(ERLLIBDIR)/include ; \
+	mkdir -p $(ERLLIBDIR)/src ; \
+	for i in ebin/*.app*   ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done ; \
+	for i in ebin/*.beam   ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done ; \
+	for i in include/*.hrl ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done ; \
+	for i in src/*.erl     ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done
+
+uninstall:
+	rm -rf $(ERLLIBDIR)
+
+check: all
+
+distclean: clean
+
+# Hack to make "make dist" work.
+# This should not work, but it appears to.
+distdir:
+
+MAINTAINERCLEANFILES = Makefile.in
+
+maintainer-clean:
+	test ! -d ebin || rm -rf ebin