From 26095c98ce175f9063df5a51d701a11dad2b99f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 20 Jan 2012 11:12:28 +0000 Subject: [PATCH] Use language name in library name. --- emi.canl.canl-c/Makefile | 14 ++++++++------ emi.canl.canl-c/project/debian.control | 8 ++++---- .../{debian.libcanl1.dirs => debian.libcanl-c1.dirs} | 0 .../{debian.libcanl1.install => debian.libcanl-c1.install} | 0 emi.canl.canl-c/project/emi-canl-c.spec | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) rename emi.canl.canl-c/project/{debian.libcanl1.dirs => debian.libcanl-c1.dirs} (100%) rename emi.canl.canl-c/project/{debian.libcanl1.install => debian.libcanl-c1.install} (100%) diff --git a/emi.canl.canl-c/Makefile b/emi.canl.canl-c/Makefile index 437567d..906e729 100644 --- a/emi.canl.canl-c/Makefile +++ b/emi.canl.canl-c/Makefile @@ -38,6 +38,8 @@ OBJ_SER=canl_sample_server.lo YACC=bison -y CFLAGS=-Wall -fPIC -I${top_srcdir}/src/proxy -I. +LIBCANL=libcanl_c.la + # In order to use libtool versioning correcty, we must have: # # current = major + minor + offset @@ -52,9 +54,9 @@ version_info:=-version-info ${shell \ major:=${shell \ perl -e '$$,=":"; @F=split "\\.","${module.version}"; print $$F[0]+$$F[1]+${offset}' } -all: libcanl.la server client +all: ${LIBCANL} server client -libcanl.la: canl.lo canl_err.lo canl_dns.lo canl_ssl.lo canl_cert.lo canl_cred.lo canl_err_desc.lo signing_policy.lo doio.lo evaluate.lo list.lo normalize.lo proxycertinfo.lo scutils.lo sslutils.lo namespaces.lo data.lo lex.signing.lo lex.namespaces.lo +${LIBCANL}: canl.lo canl_err.lo canl_dns.lo canl_ssl.lo canl_cert.lo canl_cred.lo canl_err_desc.lo signing_policy.lo doio.lo evaluate.lo list.lo normalize.lo proxycertinfo.lo scutils.lo sslutils.lo namespaces.lo data.lo lex.signing.lo lex.namespaces.lo ${LINK} -rpath ${stagedir}${prefix}/${libdir} ${version_info} $+ ${LFLAGS_LIB} -o $@ %.lo: %.y @@ -77,13 +79,13 @@ lex.namespaces.lo: lex.namespaces.c client: ${OBJ_CLI} ${LINK} $< ${LFLAGS_CLI} -o $@ -${OBJ_CLI}: ${SRC_CLI} ${HEAD_CLI} libcanl.la +${OBJ_CLI}: ${SRC_CLI} ${HEAD_CLI} ${LIBCANL} ${COMPILE} -c ${top_srcdir}/examples/${SRC_CLI} ${CFLAGS_CLI} -o $@ server: ${OBJ_SER} ${LINK} $< ${LFLAGS_SER} -o $@ -${OBJ_SER}: ${SRC_SER} ${HEAD_SER} libcanl.la +${OBJ_SER}: ${SRC_SER} ${HEAD_SER} ${LIBCANL} ${COMPILE} -c ${top_srcdir}/examples/${SRC_SER} ${CFLAGS_SER} -o $@ canl_err.h: canl_error_codes @@ -103,14 +105,14 @@ install: all mkdir -p ${DESTDIR}${PREFIX}${prefix}/include ${INSTALL} -m 755 server ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-server ${INSTALL} -m 755 client ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-client - ${INSTALL} -m 755 libcanl.la ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${LIBCANL} ${DESTDIR}${PREFIX}${prefix}/${libdir} ${INSTALL} -m 644 ${top_srcdir}/src/canl.h ${top_srcdir}/src/canl_ssl.h canl_err.h ${DESTDIR}${PREFIX}${prefix}/include stage: all $(MAKE) install PREFIX=${stagedir} clean: - rm -rfv *.o *.lo libcanl.la .libs client server ${top_srcdir}/*.c ${top_srcdir}/*.h lex.backup + rm -rfv *.o *.lo ${LIBCANL} .libs client server ${top_srcdir}/*.c ${top_srcdir}/*.h lex.backup distclean: rm -rvf Makefile.inc config.status project/changelog *.spec debian/ diff --git a/emi.canl.canl-c/project/debian.control b/emi.canl.canl-c/project/debian.control index 7174840..539ecfc 100644 --- a/emi.canl.canl-c/project/debian.control +++ b/emi.canl.canl-c/project/debian.control @@ -9,17 +9,17 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libcanl1 +Package: libcanl-c1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ -Package: libcanl-dev +Package: libcanl-c-dev Section: libdevel Architecture: any -Depends: libcanl1 (= ${binary:Version}), ${misc:Depends} +Depends: libcanl-c1 (= ${binary:Version}), ${misc:Depends} Description: Development files for EMI caNl This package contains development libraries and header files for EMI caNL. @@ -34,6 +34,6 @@ Package: emi-canl-c-dbg Section: debug Architecture: any Priority: extra -Depends: libcanl1 (= ${binary:Version}), ${misc:Depends} +Depends: libcanl-c1 (= ${binary:Version}), ${misc:Depends} Description: EMI caNl debugging symbols This package contains debugging symbols for EMI caNl. diff --git a/emi.canl.canl-c/project/debian.libcanl1.dirs b/emi.canl.canl-c/project/debian.libcanl-c1.dirs similarity index 100% rename from emi.canl.canl-c/project/debian.libcanl1.dirs rename to emi.canl.canl-c/project/debian.libcanl-c1.dirs diff --git a/emi.canl.canl-c/project/debian.libcanl1.install b/emi.canl.canl-c/project/debian.libcanl-c1.install similarity index 100% rename from emi.canl.canl-c/project/debian.libcanl1.install rename to emi.canl.canl-c/project/debian.libcanl-c1.install diff --git a/emi.canl.canl-c/project/emi-canl-c.spec b/emi.canl.canl-c/project/emi-canl-c.spec index 1a7594a..6d96ad8 100644 --- a/emi.canl.canl-c/project/emi-canl-c.spec +++ b/emi.canl.canl-c/project/emi-canl-c.spec @@ -74,14 +74,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/usr/%{_lib}/libcanl.so.@MAJOR@.@MINOR@.@REVISION@ -/usr/%{_lib}/libcanl.so.@MAJOR@ +/usr/%{_lib}/libcanl_c.so.@MAJOR@.@MINOR@.@REVISION@ +/usr/%{_lib}/libcanl_c.so.@MAJOR@ %files devel %defattr(-,root,root) /usr/include/*.h -/usr/%{_lib}/libcanl.so +/usr/%{_lib}/libcanl_c.so %files examples -- 1.8.2.3