Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078/src/libckyapplet
Modified Files:
Makefile.am Makefile.in
Added Files:
libckyapplet.pc.in
Log Message:
Package review changes: make libckyapplet a shared library.
--- NEW FILE libckyapplet.pc.in ---
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:
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 9 Jun 2006 18:44:17 -0000 1.1
+++ Makefile.am 10 Jun 2006 00:51:09 -0000 1.2
@@ -24,7 +24,7 @@
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 @@
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 @@
cky_basei.h \
dynlink.h
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libckyapplet.pc
+pcdir = $(libdir)/pkgconfig
+pc_DATA = libckyapplet.pc
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 9 Jun 2006 21:56:35 -0000 1.2
+++ Makefile.in 10 Jun 2006 00:51:09 -0000 1.3
@@ -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 @@
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 @@
$(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 @@
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 @@
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 @@
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 @@
cky_basei.h \
dynlink.h
+pcdir = $(libdir)/pkgconfig
+pc_DATA = libckyapplet.pc
all: all-recursive
.SUFFIXES:
@@ -278,17 +286,37 @@
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 @@
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 @@
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 @@
@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-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-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:
Show replies by date