[Ocfs2-tools-commits] jlbec commits r1187 - in trunk: . debian vendor/common

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-04-29 03:47:31 -0500 (Sat, 29 Apr 2006)
New Revision: 1187

Added:
   trunk/o2cb.pc.in
   trunk/o2dlm.pc.in
   trunk/ocfs2.pc.in
Modified:
   trunk/
   trunk/Makefile
   trunk/configure.in
   trunk/debian/ocfs2-tools-dev.install
   trunk/vendor/common/ocfs2-tools.spec.in
Log:

o Add pkg-config files for ocfs2-tools libraries.





Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - cscope.out
*.a
stamp-md5
configure
Config.make
config.*
autom4te.cache
aclocal.m4
ocfs2-tools-*.src.rpm
ocfs2-tools-*.tar.gz
build-stamp

   + cscope.out
*.a
stamp-md5
configure
Config.make
config.*
autom4te.cache
aclocal.m4
ocfs2-tools-*.src.rpm
ocfs2-tools-*.tar.gz
build-stamp
*.pc


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/Makefile	2006-04-29 08:47:31 UTC (rev 1187)
@@ -38,6 +38,12 @@
 
 SUBDIRS += vendor
 
+PKGCONFIG_SOURCES =	\
+	o2cb.pc.in	\
+	o2dlm.pc.in	\
+	ocfs2.pc.in
+PKGCONFIG_FILES = $(patsubst %.pc.in,%.pc,$(PKGCONFIG_SOURCES))
+
 DEBIAN_FILES =					\
 	debian/README.Debian			\
 	debian/changelog			\
@@ -53,6 +59,9 @@
 	debian/ocfs2console.manpages		\
 	debian/ocfs2console.postinst		\
 	debian/ocfs2console.prerm		\
+	debian/ocfs2-tools-dev.install		\
+	debian/ocfs2-tools-dev.postinst		\
+	debian/ocfs2-tools-dev.prerm		\
 	debian/rules
 
 DIST_FILES = \
@@ -80,6 +89,7 @@
 	documentation/ocfs2_faq.txt		\
 	documentation/users_guide.txt		\
 	documentation/samples/cluster.conf	\
+	$(PKGCONFIG_SOURCES)			\
 	$(DEBIAN_FILES)
 
 DIST_RULES = dist-subdircreate
@@ -101,8 +111,16 @@
 	$(MAKE) dist-bye
 
 distclean: clean
-	rm -f Config.make config.status config.cache config.log
+	rm -f Config.make config.status config.cache config.log $(PKGCONFIG_FILES)
 
+INSTALL_RULES = install-pkgconfig
+
+install-pkgconfig: $(PKGCONFIG_FILES)
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
+	for p in $(PKGCONFIG_FILES); do \
+	  $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/$$p; \
+        done
+
 srpm: dist
 	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --define "compile_py $(COMPILE_PY)" $(TOPDIR)/vendor/common/ocfs2-tools.spec
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/configure.in	2006-04-29 08:47:31 UTC (rev 1187)
@@ -184,6 +184,9 @@
 
 AC_CONFIG_FILES([
 Config.make
+o2cb.pc
+o2dlm.pc
+ocfs2.pc
 debugfs.ocfs2/debugfs.ocfs2.8
 mkfs.ocfs2/mkfs.ocfs2.8
 mounted.ocfs2/mounted.ocfs2.8

Modified: trunk/debian/ocfs2-tools-dev.install
===================================================================
--- trunk/debian/ocfs2-tools-dev.install	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/debian/ocfs2-tools-dev.install	2006-04-29 08:47:31 UTC (rev 1187)
@@ -2,3 +2,4 @@
 debian/tmp/usr/include/o2dlm
 debian/tmp/usr/include/ocfs2
 debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.pc

Added: trunk/o2cb.pc.in
===================================================================
--- trunk/o2cb.pc.in	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/o2cb.pc.in	2006-04-29 08:47:31 UTC (rev 1187)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: o2cb
+Description: Library for accessing the ocfs2 cluster base (o2cb)
+Version: @VERSION@
+Requires: glib-2.0 com_err
+Libs: -L${libdir} -lo2cb
+Cflags: -I${includedir}/o2cb

Added: trunk/o2dlm.pc.in
===================================================================
--- trunk/o2dlm.pc.in	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/o2dlm.pc.in	2006-04-29 08:47:31 UTC (rev 1187)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: o2dlm
+Description: Library for accessing the ocfs2 DLM
+Version: @VERSION@
+Requires: com_err
+Libs: -L${libdir} -lo2dlm
+Cflags: -I${includedir}/o2dlm

Added: trunk/ocfs2.pc.in
===================================================================
--- trunk/ocfs2.pc.in	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/ocfs2.pc.in	2006-04-29 08:47:31 UTC (rev 1187)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ocfs2
+Description: Userspace ocfs2 library
+Version: @VERSION@
+Requires: o2dlm o2cb com_err
+Libs: -L${libdir} -locfs2
+Cflags: -I${includedir}/ocfs2

Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in	2006-04-28 22:35:53 UTC (rev 1186)
+++ trunk/vendor/common/ocfs2-tools.spec.in	2006-04-29 08:47:31 UTC (rev 1187)
@@ -139,6 +139,7 @@
 %files -n ocfs2-tools-devel
 %defattr(-,root,root)
 %{_libdir}/*.a
+%{_libdir}/pkgconfig/*.pc
 %{_includedir}/o2cb
 %{_includedir}/o2dlm
 %{_includedir}/ocfs2