[Cluster-devel] cluster/dlm/lib Makefile libaislock.c libdlm.c
pcaulfield at sourceware.org
pcaulfield at sourceware.org
Thu Jun 15 09:34:42 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield at sourceware.org 2006-06-15 09:34:42
Modified files:
dlm/lib : Makefile libaislock.c libdlm.c
Log message:
Build against installed headers rather the ./configured kernel source.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/libaislock.c.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/libdlm.c.diff?cvsroot=cluster&r1=1.30&r2=1.31
--- cluster/dlm/lib/Makefile 2006/06/12 08:15:51 1.13
+++ cluster/dlm/lib/Makefile 2006/06/15 09:34:42 1.14
@@ -22,7 +22,7 @@
include ${top_srcdir}/make/defines.mk
-CFLAGS += -g -I. -O2 -idirafter ${KERNEL_SRC}/include/linux
+CFLAGS += -g -I. -O2
LDFLAGS +=
all: $(STATICLIB) $(SHAREDLIB)
--- cluster/dlm/lib/libaislock.c 2005/05/17 15:30:46 1.2
+++ cluster/dlm/lib/libaislock.c 2006/06/15 09:34:42 1.3
@@ -14,12 +14,12 @@
#include <sys/file.h>
#include <sys/stat.h>
-#include "libdlm_internal.h"
-#include "dlm.h"
+#include <linux/types.h>
+#include <linux/dlm.h>
#define BUILDING_LIBDLM
#include "libdlm.h"
#include "libaislock.h"
-#include "dlm_device.h"
+#include <linux/dlm_device.h>
enum {
SA_LCK_GRANT_CB = 1,
--- cluster/dlm/lib/libdlm.c 2006/06/12 08:15:51 1.30
+++ cluster/dlm/lib/libdlm.c 2006/06/15 09:34:42 1.31
@@ -41,10 +41,11 @@
#ifdef HAVE_SELINUX
#include <selinux/selinux.h>
#endif
-#include "dlm.h"
-#include "libdlm_internal.h"
+#include <linux/types.h>
+#include <linux/dlm.h>
+#define BUILDING_LIBDLM
#include "libdlm.h"
-#include "dlm_device.h"
+#include <linux/dlm_device.h>
#define MISC_PREFIX "/dev/misc/"
#define PROC_MISC "/proc/misc"
More information about the Cluster-devel
mailing list