From e46d4dc5710075e29de5a91fe40d42723bd4b4a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 15 May 2012 12:10:13 +0000 Subject: [PATCH] Create pkg-config files. --- org.gridsite.core/src/Makefile | 15 +++++++++++++-- org.gridsite.core/src/gridsite-globus.pc.in | 11 +++++++++++ org.gridsite.core/src/gridsite-openssl.pc.in | 11 +++++++++++ org.gridsite.core/src/make-debian-files | 1 + org.gridsite.core/src/make-gridsite-spec | 1 + 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 org.gridsite.core/src/gridsite-globus.pc.in create mode 100644 org.gridsite.core/src/gridsite-openssl.pc.in diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 1287997..838ab4a 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -72,6 +72,12 @@ endif -include Makefile.inc +ifdef OPENSSL_GLOBUS_LIBS +PC_FILES=gridsite-openssl.pc gridsite-globus.pc +else +PC_FILES=gridsite-openssl.pc +endif + # # Build # @@ -82,7 +88,7 @@ build: apidoc build-lib \ build-lib: libgridsite_globus.so.$(VERSION) libgridsite_globus.a \ libgridsite.so.$(VERSION) libgridsite.a \ - libgridsite_nossl.so.$(VERSION) libgridsite_nossl.a + libgridsite_nossl.so.$(VERSION) libgridsite_nossl.a $(PC_FILES) # First, normal versions using system OpenSSL rather than Globus OpenSSL @@ -390,12 +396,16 @@ gridsite-storage.cgi: gridsite-storage.c libgridsite.so.$(VERSION) -L$(GRIDSITEDIR)/$(libdir) \ -lgridsite $(CURL_CFLAGS) $(CURL_LIBS) +%.pc: %.pc.in + sed -e "s/@version@/$(VERSION)/" -e "s,@prefix@,$(prefix)," -e "s/@libdir@/$(libdir)/" $< > $@ + clean: rm -rvf doxygen rm -vf DelegationSoapBinding.* soapC*.c soapH*.h soapS*.c soapStub.h ns.xsd rm -vf fuse-test.c gsoap-test.c gridsite.spec rm -vf libgridsite*.so* *.cgi mod_gridsite*.so *.a *.o rm -vf gsexec urlencode htcp htcp-static findproxyfile showx509exts slashgrid fuse-test gaclexample xacmlexample htproxyput gsoap-test + rm -vf gridsite-openssl.pc gridsite-globus.pc # # Install @@ -445,7 +455,7 @@ install: apidoc install-lib cp -f mod_gridsite.so $(prefix)/$(libdir)/$(httpd_name)/modules install-lib: - mkdir -p $(prefix)/$(libdir) + mkdir -p $(prefix)/$(libdir)/pkgconfig cp -f libgridsite.a $(prefix)/$(libdir) cp -f libgridsite.so.$(PATCH_VERSION) $(prefix)/$(libdir) ln -sf libgridsite.so.$(PATCH_VERSION) \ @@ -470,6 +480,7 @@ install-lib: $(prefix)/$(libdir)/libgridsite_nossl.so.$(MAJOR_VERSION) ln -sf libgridsite_nossl.so.$(PATCH_VERSION) \ $(prefix)/$(libdir)/libgridsite_nossl.so.$(MINOR_VERSION) + cp -f $(PC_FILES) $(prefix)/$(libdir)/pkgconfig install-slashgrid: slashgrid -mkdir -p $(RPM_BUILD_ROOT)/etc/rc.d/init.d diff --git a/org.gridsite.core/src/gridsite-globus.pc.in b/org.gridsite.core/src/gridsite-globus.pc.in new file mode 100644 index 0000000..021967f --- /dev/null +++ b/org.gridsite.core/src/gridsite-globus.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=${exec_prefix}/@libdir@ +includedir=${prefix}/include + +Name: gridsite globus +Description: gridsite libs with globus support +Version: @version@ +Requires: globus-gssapi-gsi, libxml-2.0 +Libs: -L${libdir} -lgridsite_globus +Cflags: -I${includedir} diff --git a/org.gridsite.core/src/gridsite-openssl.pc.in b/org.gridsite.core/src/gridsite-openssl.pc.in new file mode 100644 index 0000000..70b4805 --- /dev/null +++ b/org.gridsite.core/src/gridsite-openssl.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=${exec_prefix}/@libdir@ +includedir=${prefix}/include + +Name: gridsite openssl +Description: gridsite libs with openssl support +Version: @version@ +Requires: openssl, libxml-2.0 +Libs: -L${libdir} -lgridsite +Cflags: -I${includedir} diff --git a/org.gridsite.core/src/make-debian-files b/org.gridsite.core/src/make-debian-files index df63340..40d98e4 100644 --- a/org.gridsite.core/src/make-debian-files +++ b/org.gridsite.core/src/make-debian-files @@ -141,6 +141,7 @@ cat > libgridsite-dev.install </dev/null diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec index 472e872..4e4453f 100755 --- a/org.gridsite.core/src/make-gridsite-spec +++ b/org.gridsite.core/src/make-gridsite-spec @@ -214,6 +214,7 @@ fi %attr(-, root, root) %{_prefix}/%{_lib}/libgridsite.so %attr(-, root, root) %{_prefix}/%{_lib}/libgridsite_globus.so %attr(-, root, root) %{_prefix}/%{_lib}/libgridsite_nossl.so +%attr(-, root, root) %{_prefix}/%{_lib}/pkgconfig/*.pc %files apache %attr(-, root, root) %{_prefix}/share/man/man8/mod_gridsite.8.gz -- 1.8.2.3