diff options
| author | Alon Levy <alevy@redhat.com> | 2010-12-09 13:48:04 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2010-12-09 13:48:04 +0200 |
| commit | 0f64c07c1f501e135cbbd813be927dd3f1628ac6 (patch) | |
| tree | 9ea8675394efc2fc9638114230d59b2f362ef0b6 | |
| parent | bda3dc4aabcbb64d552dd0d3030cfbe93529a576 (diff) | |
rename to cacard (removes underscore and redundant c==Card in CommonAccessCard acronym)
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | cacard.pc.in (renamed from cac_card.pc.in) | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
4 files changed, 15 insertions, 15 deletions
@@ -19,8 +19,8 @@ depcomp install-sh libtool config.h.in -cac_card.pc -libcac_card.la +cacard.pc +libcacard.la .deps .libs vscclient diff --git a/Makefile.am b/Makefile.am index beb45b8..24f6136 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,15 +7,15 @@ INCLUDES= \ $(USE_PASSTHRU) \ $(NULL) -lib_LTLIBRARIES = libcac_card.la +lib_LTLIBRARIES = libcacard.la -libcac_card_la_LIBADD = \ +libcacard_la_LIBADD = \ $(NSS_LIBS) \ $(PCSC_LIBS) \ $(NULL) -libcac_card_la_SOURCES= \ +libcacard_la_SOURCES= \ cac.c \ card_7816.c \ event.c \ @@ -26,9 +26,9 @@ libcac_card_la_SOURCES= \ vreader.c \ $(NULL) -libcac_cardincludedir = $(includedir)/cac_card +libcacardincludedir = $(includedir)/cacard -libcac_cardinclude_HEADERS = \ +libcacardinclude_HEADERS = \ vcard.h \ vcardt.h \ card_7816.h \ @@ -43,7 +43,7 @@ libcac_cardinclude_HEADERS = \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = cac_card.pc +pkgconfig_DATA = cacard.pc #OBJS = ${SOURCES:.c=.o} @@ -54,7 +54,7 @@ vscclient_SOURCES = \ $(NULL) vscclient_LDADD = \ - -lcac_card \ + -lcacard \ $(NULL) doclean: diff --git a/cac_card.pc.in b/cacard.pc.in index 1e9d74a..8ca3fc7 100644 --- a/cac_card.pc.in +++ b/cacard.pc.in @@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: cac_card +Name: cacard Description: SPICE server library Version: @VERSION@ Requires: @CAC_CARD_REQUIRES@ -Libs: -L${libdir} -lcac_card +Libs: -L${libdir} -lcacard Libs.private: @CAC_CARD_NONPKGCONFIG_LIBS@ -Cflags: -I${includedir}/cac_card +Cflags: -I${includedir}/cacard diff --git a/configure.ac b/configure.ac index 0556aa3..62cdfa2 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([CAC_MAJOR], 0) m4_define([CAC_MINOR], 0) m4_define([CAC_MICRO], 1) -AC_INIT(cac_card, [CAC_MAJOR.CAC_MINOR.CAC_MICRO], [], cac_card) +AC_INIT(cacard, [CAC_MAJOR.CAC_MINOR.CAC_MICRO], [], cacard) AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER([config.h]) @@ -90,13 +90,13 @@ AC_SUBST(CAC_CARD_NONPKGCONFIG_LIBS) AC_OUTPUT([ Makefile -cac_card.pc +cacard.pc ]) dnl ========================================================================== echo " - cac_card $VERSION + cacard $VERSION ============== prefix: ${prefix} |