Package review changes: make libckyapplet a shared library.

git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@10 fba4d07e-fe0f-4d7f-8147-e0026e666dc0

8 files changed, 102 insertions, 39 deletions

diff --git a/Makefile.in b/Makefile.in
index 4044415..bf57965 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -410,6 +410,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/src/libckyapplet
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/config.status b/config.status
index ea1ebf9..6bcd180 100755
--- a/config.status
+++ b/config.status
@@ -271,7 +271,7 @@ generated by GNU Autoconf 2.59.  Invocation command line was
 _CSEOF
 echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
 echo >&5
-config_files=" Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
+config_files=" Makefile src/libckyapplet/Makefile src/libckyapplet/libckyapplet.pc src/coolkey/Makefile"
 config_headers=" config.h"
 config_commands=" depfiles"
 
@@ -399,6 +399,7 @@ do
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+  "src/libckyapplet/libckyapplet.pc" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/libckyapplet.pc" ;;
   "src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff --git a/configure b/configure
index ddbcbb3..98fd11f 100755
--- a/configure
+++ b/configure
@@ -20996,7 +20996,7 @@ done
 
 
 
-                              ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
+                                        ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/libckyapplet/libckyapplet.pc src/coolkey/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -21570,6 +21570,7 @@ do
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+  "src/libckyapplet/libckyapplet.pc" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/libckyapplet.pc" ;;
   "src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff --git a/configure.in b/configure.in
index 05bb6bc..50b0a79 100644
--- a/configure.in
+++ b/configure.in
@@ -191,6 +191,7 @@ AC_CHECK_FUNCS([memset strdup strerror])
 AC_CONFIG_FILES([ 
 Makefile
 src/libckyapplet/Makefile
+src/libckyapplet/libckyapplet.pc
 src/coolkey/Makefile
 ])
 AC_OUTPUT
diff --git a/coolkey.spec b/coolkey.spec
index 3294e6d..b7d036a 100644
--- a/coolkey.spec
+++ b/coolkey.spec
@@ -48,7 +48,7 @@ Linux Driver support to access the CoolKey applet.
 
 %build
 %configure --disable-dependency-tracking 
-make %(?_smp_mflags)
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +56,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.a
-install -m 755 clib/.libs/libckyapplet.a $RPM_BUILD_ROOT/%{_libdir}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,9 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog LICENSE 
 %{_libdir}/libcoolkeypk11.so
 %{_libdir}/pkcs11/libcoolkeypk11.so
+%{_libdir}/libckyapplet.so.1
+%{_libdir}/libckyapplet.so.1.0.0
 
 %files devel
-%{_libdir}/libckyapplet.a
+%{_libdir}/libckyapplet.so
+%{_libdir}/pkgconfig/libckyapplet.pc
 %{_includedir}/*.h
 
 
diff --git a/src/libckyapplet/Makefile.am b/src/libckyapplet/Makefile.am
index a32055c..099c9e6 100644
--- a/src/libckyapplet/Makefile.am
+++ b/src/libckyapplet/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS =
 AM_CFLAGS =
 
 # bleh what do I add just to get static but pic libraries?
-noinst_LTLIBRARIES = libckyapplet.la
+lib_LTLIBRARIES = libckyapplet.la
 
 libckyapplet_la_SOURCES = \
 	cky_applet.c \
@@ -35,7 +35,7 @@ libckyapplet_la_SOURCES = \
 
 quote=\"
 
-libckyapplet_la_LDFLAGS = -avoid-version
+libckyapplet_la_LDFLAGS = -version-info 1:0:0
 libckyapplet_la_CFLAGS = $(CFLAGS) -DSCARD_LIB_NAME=$(quote)$(SCARD_LIB_NAME)$(quote) $(PCSC_CFLAGS)
 
 nobase_include_HEADERS = \
@@ -49,5 +49,5 @@ noinst_HEADERS = \
 	cky_basei.h \
 	dynlink.h 
 
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libckyapplet.pc
+pcdir = $(libdir)/pkgconfig
+pc_DATA = libckyapplet.pc
diff --git a/src/libckyapplet/Makefile.in b/src/libckyapplet/Makefile.in
index 50342c6..97cb2db 100644
--- a/src/libckyapplet/Makefile.in
+++ b/src/libckyapplet/Makefile.in
@@ -36,6 +36,7 @@
 # Process this file with automake to create Makefile.in
 
 
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -61,7 +62,8 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = src/libckyapplet
 DIST_COMMON = $(nobase_include_HEADERS) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/libckyapplet.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.in
@@ -69,8 +71,17 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+CONFIG_CLEAN_FILES = libckyapplet.pc
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pcdir)" \
+	"$(DESTDIR)$(includedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libckyapplet_la_LIBADD =
 am_libckyapplet_la_OBJECTS = libckyapplet_la-cky_applet.lo \
 	libckyapplet_la-cky_base.lo libckyapplet_la-cky_card.lo \
@@ -95,13 +106,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
+pcDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pc_DATA)
 nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
 HEADERS = $(nobase_include_HEADERS) $(noinst_HEADERS)
 ETAGS = etags
@@ -223,7 +229,7 @@ SUBDIRS =
 AM_CFLAGS = 
 
 # bleh what do I add just to get static but pic libraries?
-noinst_LTLIBRARIES = libckyapplet.la
+lib_LTLIBRARIES = libckyapplet.la
 libckyapplet_la_SOURCES = \
 	cky_applet.c \
 	cky_base.c \
@@ -232,7 +238,7 @@ libckyapplet_la_SOURCES = \
 	dynlink.c 
 
 quote = \"
-libckyapplet_la_LDFLAGS = -avoid-version
+libckyapplet_la_LDFLAGS = -version-info 1:0:0
 libckyapplet_la_CFLAGS = $(CFLAGS) -DSCARD_LIB_NAME=$(quote)$(SCARD_LIB_NAME)$(quote) $(PCSC_CFLAGS)
 nobase_include_HEADERS = \
 	cky_base.h \
@@ -245,6 +251,8 @@ noinst_HEADERS = \
 	cky_basei.h \
 	dynlink.h 
 
+pcdir = $(libdir)/pkgconfig
+pc_DATA = libckyapplet.pc
 all: all-recursive
 
 .SUFFIXES:
@@ -278,17 +286,37 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+libckyapplet.pc: $(top_builddir)/config.status $(srcdir)/libckyapplet.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libckyapplet.la: $(libckyapplet_la_OBJECTS) $(libckyapplet_la_DEPENDENCIES) 
-	$(LINK)  $(libckyapplet_la_LDFLAGS) $(libckyapplet_la_OBJECTS) $(libckyapplet_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libckyapplet_la_LDFLAGS) $(libckyapplet_la_OBJECTS) $(libckyapplet_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -367,6 +395,23 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-pcDATA: $(pc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pcdir)" || $(mkdir_p) "$(DESTDIR)$(pcdir)"
+	@list='$(pc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcdir)/$$f'"; \
+	  $(pcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcdir)/$$f"; \
+	done
+
+uninstall-pcDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pcdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pcdir)/$$f"; \
+	done
 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
@@ -563,10 +608,10 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pcdir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -595,7 +640,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -614,9 +659,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-nobase_includeHEADERS
+install-data-am: install-nobase_includeHEADERS install-pcDATA
 
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 
 install-info: install-info-recursive
 
@@ -642,28 +687,28 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-nobase_includeHEADERS uninstall-pcDATA
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	clean clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-recursive ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-nobase_includeHEADERS \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-nobase_includeHEADERS install-pcDATA install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-nobase_includeHEADERS
-
+	uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-nobase_includeHEADERS uninstall-pcDATA
 
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libckyapplet.pc
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/libckyapplet/libckyapplet.pc.in b/src/libckyapplet/libckyapplet.pc.in
new file mode 100644
index 0000000..4302e2c
--- /dev/null
+++ b/src/libckyapplet/libckyapplet.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: CoolKey Applet Library
+Description: Library to talk to the CoolKey applet.
+Version: 1.0.0
+Libs: -L${libdir} -lckyapplet
+Cflags: