Add preliminary libtool files for libaria2

.gitignore

@@ -1,5 +1,7 @@
 *~
 *.o
+*.lo
+*.la
 *.ce
 *.cce
 *.he
@@ -31,3 +33,4 @@ libtool
 ltmain.sh
 po/aria2.pot
 po/remove-potcdate.sed
+src/libaria2.pc

configure.ac

@@ -6,6 +6,12 @@ LT_PREREQ([2.2.6])
 AC_INIT([aria2],[1.17.0],[t-tujikawa@users.sourceforge.net],[aria2],[http://aria2.sourceforge.net/])
 AC_USE_SYSTEM_EXTENSIONS
 LT_INIT()
+dnl See versioning rule:
+dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST(LT_CURRENT, 0)
+AC_SUBST(LT_REVISION, 0)
+AC_SUBST(LT_AGE, 0)
+
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -667,7 +673,8 @@ if test "x$enable_message_digest" = "xyes"; then
   enable_websocket=yes
   AC_DEFINE([ENABLE_WEBSOCKET], [1],
             [Define 1 if WebSocket support is enabled.])
-  LIBS="\$(top_builddir)/deps/wslay/lib/libwslay.la $LIBS"
+  WSLAY_LIBS="\$(top_builddir)/deps/wslay/lib/libwslay.la"
+  AC_SUBST([WSLAY_LIBS])
   # $(top_srcdir) for `make distcheck`
   CPPFLAGS="-I\$(top_builddir)/deps/wslay/lib/includes -I\$(top_srcdir)/deps/wslay/lib/includes $CPPFLAGS"
 fi
@@ -693,6 +700,8 @@ fi
 
 AC_CONFIG_FILES([Makefile
 		src/Makefile
+		src/libaria2.pc
+		src/includes/Makefile
 		test/Makefile
 		po/Makefile.in
 		intl/Makefile

deps/wslay/configure.ac

@@ -23,7 +23,7 @@ dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 AC_PREREQ(2.61)
 AC_INIT([wslay], [0.1.1], [t-tujikawa@users.sourceforge.net])
 LT_PREREQ([2.2.6])
-LT_INIT([disable-shared])
+LT_INIT()
 AC_CONFIG_AUX_DIR([.])
 dnl See versioning rule:
 dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html

src/Makefile.am

@@ -1,3 +1,4 @@
+SUBDIRS = includes
 bin_PROGRAMS = aria2c
 aria2c_SOURCES = main.cc\
 	option_processing.cc\
@@ -630,10 +631,15 @@ SRCS += KqueueEventPoll.cc KqueueEventPoll.h
 endif # HAVE_KQUEUE
 
 AR = @AR@
-noinst_LIBRARIES = libaria2c.a
+noinst_LTLIBRARIES = libaria2c.la
-libaria2c_a_SOURCES = $(SRCS)
+libaria2c_la_SOURCES = $(SRCS)
-aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ #-lprofiler
+libaria2c_la_LIBADD = @WSLAY_LIBS@
+aria2c_LDADD = libaria2c.la @LIBINTL@ @ALLOCA@ #-lprofiler
 #aria2c_LDFLAGS = -pg
 AM_CPPFLAGS =  -Wall\
 	-I$(top_srcdir)/lib -I$(top_srcdir)/intl\
 	-DLOCALEDIR=\"@localedir@\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg
+
+lib_LTLIBRARIES = libaria2.la
+libaria2_la_SOURCES =
+libaria2_la_LIBADD = libaria2c.la

src/libaria2.pc.in

@@ -0,0 +1,42 @@
+# aria2 - The high speed download utility
+#
+# Copyright (C) 2013 Tatsuhiro Tsujikawa
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: aria2
+Description: High speed download utility library
+URL: http://aria2.sourceforge.net/
+Version: @VERSION@
+Libs: -L${libdir} -laria2
+# TODO Add Requires.private: here
+Cflags: -I${includedir}

test/Makefile.am

@@ -237,7 +237,7 @@ if !HAVE_TIMEGM
 aria2c_SOURCES += TimegmTest.cc
 endif # !HAVE_TIMEGM
 
-aria2c_LDADD = ../src/libaria2c.a @LIBINTL@ @CPPUNIT_LIBS@
+aria2c_LDADD = ../src/libaria2c.la @LIBINTL@ @CPPUNIT_LIBS@
 AM_CPPFLAGS =  -Wall\
 	-I$(top_srcdir)/src\
 	-I$(top_srcdir)/lib -I$(top_srcdir)/intl\