[Ocfs2-tools-commits] jlbec commits r1188 - in trunk: . libo2dlm/include libocfs2/include

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-04-29 05:24:12 -0500 (Sat, 29 Apr 2006)
New Revision: 1188

Modified:
   trunk/libo2dlm/include/o2dlm.h
   trunk/libocfs2/include/ocfs2.h
   trunk/o2cb.pc.in
   trunk/o2dlm.pc.in
   trunk/ocfs2.pc.in
Log:

o Fix flat includes in ocfs2.h
o Fix limits.h in o2dlm.h
o Fix include paths in .pc.in files.



Modified: trunk/libo2dlm/include/o2dlm.h
===================================================================
--- trunk/libo2dlm/include/o2dlm.h	2006-04-29 08:47:31 UTC (rev 1187)
+++ trunk/libo2dlm/include/o2dlm.h	2006-04-29 10:24:12 UTC (rev 1188)
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <limits.h>
 
 #include <stdlib.h>
 

Modified: trunk/libocfs2/include/ocfs2.h
===================================================================
--- trunk/libocfs2/include/ocfs2.h	2006-04-29 08:47:31 UTC (rev 1187)
+++ trunk/libocfs2/include/ocfs2.h	2006-04-29 10:24:12 UTC (rev 1188)
@@ -48,10 +48,11 @@
 
 #include "byteorder.h"
 
-#include <o2dlm.h>
-#include <o2cb.h>
 
 #if OCFS2_FLAT_INCLUDES
+#include "o2dlm.h"
+#include "o2cb.h"
+
 #include "kernel-list.h"
 #include "kernel-rbtree.h"
 
@@ -59,6 +60,9 @@
 #include "ocfs2_fs.h"
 #include "jbd.h"
 #else
+#include <o2dlm/o2dlm.h>
+#include <o2cb/o2cb.h>
+
 #include <ocfs2/kernel-list.h>
 #include <ocfs2/kernel-rbtree.h>
 

Modified: trunk/o2cb.pc.in
===================================================================
--- trunk/o2cb.pc.in	2006-04-29 08:47:31 UTC (rev 1187)
+++ trunk/o2cb.pc.in	2006-04-29 10:24:12 UTC (rev 1188)
@@ -6,6 +6,6 @@
 Name: o2cb
 Description: Library for accessing the ocfs2 cluster base (o2cb)
 Version: @VERSION@
-Requires: glib-2.0 com_err
+Requires: com_err
 Libs: -L${libdir} -lo2cb
-Cflags: -I${includedir}/o2cb
+Cflags: -I${includedir}

Modified: trunk/o2dlm.pc.in
===================================================================
--- trunk/o2dlm.pc.in	2006-04-29 08:47:31 UTC (rev 1187)
+++ trunk/o2dlm.pc.in	2006-04-29 10:24:12 UTC (rev 1188)
@@ -8,4 +8,4 @@
 Version: @VERSION@
 Requires: com_err
 Libs: -L${libdir} -lo2dlm
-Cflags: -I${includedir}/o2dlm
+Cflags: -I${includedir}

Modified: trunk/ocfs2.pc.in
===================================================================
--- trunk/ocfs2.pc.in	2006-04-29 08:47:31 UTC (rev 1187)
+++ trunk/ocfs2.pc.in	2006-04-29 10:24:12 UTC (rev 1188)
@@ -8,4 +8,4 @@
 Version: @VERSION@
 Requires: o2dlm o2cb com_err
 Libs: -L${libdir} -locfs2
-Cflags: -I${includedir}/ocfs2
+Cflags: -I${includedir}