[Ocfs2-tools-devel] [PATCH 2/4] includes: Move public o2dlm headers
to the new location.
Joel Becker
joel.becker at oracle.com
Mon Jan 7 17:19:32 PST 2008
The public headers for libo2dlm now live at $(TOPDIR)/include/o2dlm.
All programs have been modified to explicitly include <o2dlm/o2dlm.h>.
This removes the need for specifying a separate include path for o2dlm,
as well as the O2DLM_FLAT_INCLUDES define.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
---
debugfs.ocfs2/Makefile | 4 +-
extras/Makefile | 4 +-
fsck.ocfs2/Makefile | 3 +-
fswreck/Makefile | 4 +-
include/Makefile | 2 +-
include/o2dlm/.gitignore | 1 +
include/o2dlm/Makefile | 27 +++++++
include/o2dlm/o2dlm.h | 126 ++++++++++++++++++++++++++++++++
libo2dlm/Makefile | 21 +-----
libo2dlm/include/.gitignore | 1 -
libo2dlm/include/o2dlm.h | 131 ----------------------------------
libo2dlm/o2dlm.c | 2 +-
libo2dlm/o2dlm_test.c | 2 +-
libocfs2/Makefile | 4 +-
libocfs2/include/ocfs2.h | 3 +-
listuuid/Makefile | 3 +-
mkfs.ocfs2/Makefile | 5 +-
mount.ocfs2/Makefile | 4 +-
mounted.ocfs2/Makefile | 4 +-
ocfs2_hb_ctl/Makefile | 4 +-
ocfs2cdsl/Makefile | 5 +-
ocfs2console/ocfs2interface/Makefile | 3 +-
sizetest/Makefile | 4 +-
tunefs.ocfs2/Makefile | 4 +-
24 files changed, 186 insertions(+), 185 deletions(-)
create mode 100644 include/o2dlm/.gitignore
create mode 100644 include/o2dlm/Makefile
create mode 100644 include/o2dlm/o2dlm.h
delete mode 100644 libo2dlm/include/.gitignore
delete mode 100644 libo2dlm/include/o2dlm.h
diff --git a/debugfs.ocfs2/Makefile b/debugfs.ocfs2/Makefile
index c45bf7b..96667f9 100644
--- a/debugfs.ocfs2/Makefile
+++ b/debugfs.ocfs2/Makefile
@@ -6,9 +6,9 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = debugfs.ocfs2
DEFINES = -DG_DISABLE_DEPRECATED -DLINUX -DDEBUGOCFS -DDEBUG
-DEFINES += -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES += -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2CB_FLAT_INCLUDES
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include
INCLUDES += $(GLIB_CFLAGS)
ifdef OCFS2_DEBUG
diff --git a/extras/Makefile b/extras/Makefile
index 5a2675a..ad2c9d5 100644
--- a/extras/Makefile
+++ b/extras/Makefile
@@ -13,11 +13,11 @@ CFLAGS = $(OPTS) $(WARNINGS)
UNINST_PROGRAMS = find_hardlinks find_dup_extents find_inode_paths set_random_bits decode_lockres encode_lockres mark_journal_dirty find_allocation_fragments compute_groups
-INCLUDES = -I$(TOPDIR)/include -I../libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -I../libocfs2/include -I$(TOPDIR)/libo2cb/include
OPTIMIZE = -O2
-DEFINES += -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
CFLAGS += $(OPTIMIZE)
diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
index a093bb4..564bcc3 100644
--- a/fsck.ocfs2/Makefile
+++ b/fsck.ocfs2/Makefile
@@ -6,7 +6,6 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = fsck.ocfs2
INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2dlm/include \
-I$(TOPDIR)/libo2cb/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
@@ -28,7 +27,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
CFILES = fsck.c \
dirblocks.c \
diff --git a/fswreck/Makefile b/fswreck/Makefile
index 1a828a7..a7fa789 100644
--- a/fswreck/Makefile
+++ b/fswreck/Makefile
@@ -5,9 +5,9 @@ include $(TOPDIR)/Preamble.make
SBIN_PROGRAMS = fswreck
DEFINES = -DG_DISABLE_DEPRECATED -DLINUX
-DEFINES += -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
+DEFINES += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include
INCLUDES += $(GLIB_CFLAGS)
ifdef OCFS2_DEBUG
diff --git a/include/Makefile b/include/Makefile
index e37c064..68470e3 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -2,6 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-SUBDIRS = ocfs2fs
+SUBDIRS = ocfs2fs o2dlm
include $(TOPDIR)/Postamble.make
diff --git a/include/o2dlm/.gitignore b/include/o2dlm/.gitignore
new file mode 100644
index 0000000..1d67871
--- /dev/null
+++ b/include/o2dlm/.gitignore
@@ -0,0 +1 @@
+o2dlm_err.h
diff --git a/include/o2dlm/Makefile b/include/o2dlm/Makefile
new file mode 100644
index 0000000..83c8bf6
--- /dev/null
+++ b/include/o2dlm/Makefile
@@ -0,0 +1,27 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+HFILES_GEN = o2dlm_err.h
+
+all: $(HFILES_GEN)
+
+HFILES = o2dlm.h
+
+HEADERS_SUBDIR = o2dlm
+HEADERS = $(HFILES) $(HFILES_GEN)
+
+o2dlm_err.h: $(TOPDIR)/libo2dlm/o2dlm_err.h
+ cp $< $@
+
+$(TOPDIR)/libo2dlm/o2dlm_err.h:
+ make -C $(TOPDIR)/libo2dlm o2dlm_err.h
+
+DIST_FILES = $(HFILES)
+
+CLEAN_RULES = clean-err
+
+clean-err:
+ rm -f o2dlm_err.h
+
+include $(TOPDIR)/Postamble.make
diff --git a/include/o2dlm/o2dlm.h b/include/o2dlm/o2dlm.h
new file mode 100644
index 0000000..b218de4
--- /dev/null
+++ b/include/o2dlm/o2dlm.h
@@ -0,0 +1,126 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * o2dlm.h
+ *
+ * Defines the userspace locking api
+ *
+ * Copyright (C) 2004 Oracle. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ *
+ * Authors: Mark Fasheh <mark.fasheh at oracle.com>
+ */
+
+#ifndef _O2DLM_H_
+#define _O2DLM_H_
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+
+#include <stdlib.h>
+
+#include <et/com_err.h>
+
+#include <ocfs2fs/kernel-list.h>
+#include <o2dlm/o2dlm_err.h>
+
+#define O2DLM_LOCK_ID_MAX_LEN 32
+#define O2DLM_DOMAIN_MAX_LEN 255
+
+/* + null pointer */
+#define O2DLM_MAX_FULL_DOMAIN_PATH (PATH_MAX + 1)
+
+/* valid lock flags */
+#define O2DLM_TRYLOCK 0x01
+#define O2DLM_VALID_FLAGS (O2DLM_TRYLOCK)
+
+/* valid lock levels */
+enum o2dlm_lock_level
+{
+ O2DLM_LEVEL_PRMODE,
+ O2DLM_LEVEL_EXMODE
+};
+
+struct o2dlm_lock_res
+{
+ struct list_head l_bucket; /* to hang us off the locks list */
+ char l_id[O2DLM_LOCK_ID_MAX_LEN]; /* 32 byte,
+ * null
+ * terminated
+ * string */
+ int l_flags; /* limited set of flags */
+ enum o2dlm_lock_level l_level; /* either PR or EX */
+ int l_fd; /* the fd returned by the open call */
+};
+
+struct o2dlm_ctxt
+{
+ struct list_head *ct_hash;
+ unsigned int ct_hash_size;
+ char ct_domain_path[O2DLM_MAX_FULL_DOMAIN_PATH]; /* domain
+ * dir */
+ char ct_ctxt_lock_name[O2DLM_LOCK_ID_MAX_LEN];
+};
+
+/* Expects to be given a path to the root of a valid ocfs2_dlmfs file
+ * system and a domain identifier of length <= 255 characters including
+ * the '\0' */
+errcode_t o2dlm_initialize(const char *dlmfs_path,
+ const char *domain_name,
+ struct o2dlm_ctxt **ctxt);
+
+/*
+ * lock_name, is a valid lock name -- 32 bytes long including the null
+ * character
+ *
+ * Returns: 0 if we got the lock we wanted
+ */
+errcode_t o2dlm_lock(struct o2dlm_ctxt *ctxt,
+ const char *lockid,
+ int flags,
+ enum o2dlm_lock_level level);
+
+/* returns 0 on success */
+errcode_t o2dlm_unlock(struct o2dlm_ctxt *ctxt,
+ char *lockid);
+
+/* Read the LVB out of a lock.
+ * 'len' is the amount to read into 'lvb'
+ *
+ * We can only read LVB_MAX bytes out of the lock, even if you
+ * specificy a len larger than that.
+ *
+ * If you want to know how much was read, then pass 'bytes_read'
+ */
+errcode_t o2dlm_read_lvb(struct o2dlm_ctxt *ctxt,
+ char *lockid,
+ char *lvb,
+ unsigned int len,
+ unsigned int *bytes_read);
+
+errcode_t o2dlm_write_lvb(struct o2dlm_ctxt *ctxt,
+ char *lockid,
+ const char *lvb,
+ unsigned int len,
+ unsigned int *bytes_written);
+
+/*
+ * Unlocks all pending locks and frees the lock context.
+ */
+errcode_t o2dlm_destroy(struct o2dlm_ctxt *ctxt);
+#endif /* _O2DLM_H_ */
diff --git a/libo2dlm/Makefile b/libo2dlm/Makefile
index 5a439d1..57412fd 100644
--- a/libo2dlm/Makefile
+++ b/libo2dlm/Makefile
@@ -11,12 +11,11 @@ else
OPTS += -O2
endif
-INCLUDES = -I$(TOPDIR)/include -Iinclude
+INCLUDES = -I$(TOPDIR)/include
LIBRARIES = libo2dlm.a
CFLAGS = $(OPTS) $(WARNINGS) -fPIC
-CPPFLAGS += -DO2DLM_FLAT_INCLUDES
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
@@ -40,13 +39,7 @@ CFILES = o2dlm.c
TESTING_CFILES = o2dlm_test.c
-HFILES = include/o2dlm.h
-
-HFILES_GEN = \
- include/o2dlm_err.h
-
-HEADERS_SUBDIR = o2dlm
-HEADERS = $(HFILES) $(HFILES_GEN)
+HFILES_GEN = o2dlm_err.h
OBJS = $(subst .c,.o,$(CFILES)) \
o2dlm_err.o
@@ -55,9 +48,6 @@ $(OBJS): $(HFILES_GEN)
TESTING_OBJS = $(subst .c,.o,$(TESTING_CFILES))
-include/o2dlm_err.h: o2dlm_err.h
- cp $< $@
-
o2dlm_err.c o2dlm_err.h: o2dlm_err.et
compile_et o2dlm_err.et
@@ -71,15 +61,10 @@ o2dlm_test: $(TESTING_OBJS) $(LIBRARIES) $(COM_ERR_LIBS)
DIST_FILES = $(CFILES) $(HFILES) o2dlm_err.et $(TESTING_CFILES)
-DIST_RULES = dist-subdircreate
-
-dist-subdircreate:
- $(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
-
CLEAN_RULES = clean-err clean-test
clean-err:
- rm -f o2dlm_err.c o2dlm_err.h include/o2dlm_err.h
+ rm -f o2dlm_err.c o2dlm_err.h
clean-test:
rm -f o2dlm_test
diff --git a/libo2dlm/include/.gitignore b/libo2dlm/include/.gitignore
deleted file mode 100644
index 0e08d05..0000000
--- a/libo2dlm/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-o2dlm_err.*
diff --git a/libo2dlm/include/o2dlm.h b/libo2dlm/include/o2dlm.h
deleted file mode 100644
index 8ff1e44..0000000
--- a/libo2dlm/include/o2dlm.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * o2dlm.h
- *
- * Defines the userspace locking api
- *
- * Copyright (C) 2004 Oracle. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Mark Fasheh <mark.fasheh at oracle.com>
- */
-
-#ifndef _O2DLM_H_
-#define _O2DLM_H_
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <limits.h>
-
-#include <stdlib.h>
-
-#include <et/com_err.h>
-
-#include <ocfs2fs/kernel-list.h>
-
-#if O2DLM_FLAT_INCLUDES
-#include "o2dlm_err.h"
-#else
-#include <o2dlm/o2dlm_err.h>
-#endif
-
-#define O2DLM_LOCK_ID_MAX_LEN 32
-#define O2DLM_DOMAIN_MAX_LEN 255
-
-/* + null pointer */
-#define O2DLM_MAX_FULL_DOMAIN_PATH (PATH_MAX + 1)
-
-/* valid lock flags */
-#define O2DLM_TRYLOCK 0x01
-#define O2DLM_VALID_FLAGS (O2DLM_TRYLOCK)
-
-/* valid lock levels */
-enum o2dlm_lock_level
-{
- O2DLM_LEVEL_PRMODE,
- O2DLM_LEVEL_EXMODE
-};
-
-struct o2dlm_lock_res
-{
- struct list_head l_bucket; /* to hang us off the locks list */
- char l_id[O2DLM_LOCK_ID_MAX_LEN]; /* 32 byte,
- * null
- * terminated
- * string */
- int l_flags; /* limited set of flags */
- enum o2dlm_lock_level l_level; /* either PR or EX */
- int l_fd; /* the fd returned by the open call */
-};
-
-struct o2dlm_ctxt
-{
- struct list_head *ct_hash;
- unsigned int ct_hash_size;
- char ct_domain_path[O2DLM_MAX_FULL_DOMAIN_PATH]; /* domain
- * dir */
- char ct_ctxt_lock_name[O2DLM_LOCK_ID_MAX_LEN];
-};
-
-/* Expects to be given a path to the root of a valid ocfs2_dlmfs file
- * system and a domain identifier of length <= 255 characters including
- * the '\0' */
-errcode_t o2dlm_initialize(const char *dlmfs_path,
- const char *domain_name,
- struct o2dlm_ctxt **ctxt);
-
-/*
- * lock_name, is a valid lock name -- 32 bytes long including the null
- * character
- *
- * Returns: 0 if we got the lock we wanted
- */
-errcode_t o2dlm_lock(struct o2dlm_ctxt *ctxt,
- const char *lockid,
- int flags,
- enum o2dlm_lock_level level);
-
-/* returns 0 on success */
-errcode_t o2dlm_unlock(struct o2dlm_ctxt *ctxt,
- char *lockid);
-
-/* Read the LVB out of a lock.
- * 'len' is the amount to read into 'lvb'
- *
- * We can only read LVB_MAX bytes out of the lock, even if you
- * specificy a len larger than that.
- *
- * If you want to know how much was read, then pass 'bytes_read'
- */
-errcode_t o2dlm_read_lvb(struct o2dlm_ctxt *ctxt,
- char *lockid,
- char *lvb,
- unsigned int len,
- unsigned int *bytes_read);
-
-errcode_t o2dlm_write_lvb(struct o2dlm_ctxt *ctxt,
- char *lockid,
- const char *lvb,
- unsigned int len,
- unsigned int *bytes_written);
-
-/*
- * Unlocks all pending locks and frees the lock context.
- */
-errcode_t o2dlm_destroy(struct o2dlm_ctxt *ctxt);
-#endif /* _O2DLM_H_ */
diff --git a/libo2dlm/o2dlm.c b/libo2dlm/o2dlm.c
index 5f3fe19..49ac218 100644
--- a/libo2dlm/o2dlm.c
+++ b/libo2dlm/o2dlm.c
@@ -38,7 +38,7 @@
#include <sys/statfs.h>
#include <string.h>
-#include <o2dlm.h>
+#include "o2dlm/o2dlm.h"
#define USER_DLMFS_MAGIC 0x76a9f425
diff --git a/libo2dlm/o2dlm_test.c b/libo2dlm/o2dlm_test.c
index 3edfab3..830a339 100644
--- a/libo2dlm/o2dlm_test.c
+++ b/libo2dlm/o2dlm_test.c
@@ -34,7 +34,7 @@
#include <string.h>
-#include "o2dlm.h"
+#include "o2dlm/o2dlm.h"
#define COMMAND_MAX_LEN 4096
diff --git a/libocfs2/Makefile b/libocfs2/Makefile
index 99a2831..e4f89e2 100644
--- a/libocfs2/Makefile
+++ b/libocfs2/Makefile
@@ -11,7 +11,7 @@ else
OPTS += -O2
endif
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libo2cb/include
LIBRARIES = libocfs2.a
@@ -22,7 +22,7 @@ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
CFLAGS = $(OPTS) $(WARNINGS) -fPIC
-CPPFLAGS += -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+CPPFLAGS += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
diff --git a/libocfs2/include/ocfs2.h b/libocfs2/include/ocfs2.h
index 108dd8d..b1e2634 100644
--- a/libocfs2/include/ocfs2.h
+++ b/libocfs2/include/ocfs2.h
@@ -51,16 +51,15 @@
#include <ocfs2fs/kernel-list.h>
#include <ocfs2fs/ocfs2_fs.h>
+#include <o2dlm/o2dlm.h>
#if OCFS2_FLAT_INCLUDES
-#include "o2dlm.h"
#include "o2cb.h"
#include "kernel-rbtree.h"
#include "ocfs2_err.h"
#include "jbd.h"
#else
-#include <o2dlm/o2dlm.h>
#include <o2cb/o2cb.h>
#include <ocfs2/kernel-rbtree.h>
diff --git a/listuuid/Makefile b/listuuid/Makefile
index fe2e633..21662f4 100644
--- a/listuuid/Makefile
+++ b/listuuid/Makefile
@@ -4,7 +4,6 @@ include $(TOPDIR)/Preamble.make
INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
-I$(TOPDIR)/libocfs2cluster/include \
- -I$(TOPDIR)/libo2dlm/include \
-I$(TOPDIR)/libo2cb/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
@@ -25,7 +24,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
UNINST_PROGRAMS = listuuid
diff --git a/mkfs.ocfs2/Makefile b/mkfs.ocfs2/Makefile
index 03bdf61..7472436 100644
--- a/mkfs.ocfs2/Makefile
+++ b/mkfs.ocfs2/Makefile
@@ -24,13 +24,12 @@ LIBO2CB_CFLAGS = -I$(TOPDIR)/libo2cb/include
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-LIBO2DLM_CFLAGS = -I$(TOPDIR)/libo2dlm/include
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
-INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(LIBO2DLM_CFLAGS) $(LIBO2CB_CFLAGS) -I.
+INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(LIBO2CB_CFLAGS) -I.
DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" \
- -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+ -DO2CB_FLAT_INCLUDES
CFILES = mkfs.c check.c
HFILES = mkfs.h
diff --git a/mount.ocfs2/Makefile b/mount.ocfs2/Makefile
index 86e5cdb..b87b86a 100644
--- a/mount.ocfs2/Makefile
+++ b/mount.ocfs2/Makefile
@@ -6,7 +6,7 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = mount.ocfs2
INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include -I$(TOPDIR)/libo2dlm/include
+ -I$(TOPDIR)/libo2cb/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
@@ -23,7 +23,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES \
+DEFINES = -DOCFS2_FLAT_INCLUDES \
-DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
CFILES = opts.c mount.ocfs2.c
diff --git a/mounted.ocfs2/Makefile b/mounted.ocfs2/Makefile
index 863ceff..e9a67cc 100644
--- a/mounted.ocfs2/Makefile
+++ b/mounted.ocfs2/Makefile
@@ -11,7 +11,7 @@ else
OPTS = -O2
endif
-CFLAGS = $(OPTS) $(WARNINGS) -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES \
+CFLAGS = $(OPTS) $(WARNINGS) -DOCFS2_FLAT_INCLUDES \
-DO2CB_FLAT_INCLUDES
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
@@ -26,7 +26,7 @@ LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
sbindir = $(root_sbindir)
SBIN_PROGRAMS = mounted.ocfs2
-INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include \
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include \
-I$(TOPDIR)/libo2cb/include
CFILES = mounted.c
diff --git a/ocfs2_hb_ctl/Makefile b/ocfs2_hb_ctl/Makefile
index 8b18e49..e690486 100644
--- a/ocfs2_hb_ctl/Makefile
+++ b/ocfs2_hb_ctl/Makefile
@@ -6,7 +6,7 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = ocfs2_hb_ctl
INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include -I$(TOPDIR)/libo2dlm/include
+ -I$(TOPDIR)/libo2cb/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
@@ -27,7 +27,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES \
+DEFINES = -DOCFS2_FLAT_INCLUDES \
-DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
CFILES = ocfs2_hb_ctl.c
diff --git a/ocfs2cdsl/Makefile b/ocfs2cdsl/Makefile
index 1ed8b95..b2e7fd0 100644
--- a/ocfs2cdsl/Makefile
+++ b/ocfs2cdsl/Makefile
@@ -12,7 +12,6 @@ LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
-LIBO2DLM_CFLAGS = -I$(TOPDIR)/libo2dlm/include
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
@@ -26,10 +25,10 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = ocfs2cdsl
DEFINES = -DVERSION=\"$(VERSION)\"
-DEFINES += -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
DEFINES += -DG_DISABLE_DEPRECATED
-INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(LIBO2DLM_CFLAGS) $(LIBO2CB_CFLAGS) $(GLIB_CFLAGS)
+INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(LIBO2CB_CFLAGS) $(GLIB_CFLAGS)
OPTIMIZE = -O2
diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile
index b3a3598..55b8f8d 100644
--- a/ocfs2console/ocfs2interface/Makefile
+++ b/ocfs2console/ocfs2interface/Makefile
@@ -19,7 +19,6 @@ LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
-LIBO2DLM_CFLAGS = -I$(TOPDIR)/libo2dlm/include
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
@@ -37,7 +36,7 @@ BLKID_LIBS = -L$(TOPDIR)/ocfs2console/blkid -lblkid-internal $(UUID_LIBS)
endif
O2CB_CPPFLAGS = -DO2CB_FLAT_INCLUDES $(LIBO2CB_CFLAGS)
-OCFS2_CPPFLAGS = -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES $(LIBOCFS2_CFLAGS) $(LIBO2DLM_CFLAGS) $(O2CB_CPPFLAGS)
+OCFS2_CPPFLAGS = -DOCFS2_FLAT_INCLUDES $(LIBOCFS2_CFLAGS) $(O2CB_CPPFLAGS)
GLIB_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
diff --git a/sizetest/Makefile b/sizetest/Makefile
index 2c7bca3..b794555 100644
--- a/sizetest/Makefile
+++ b/sizetest/Makefile
@@ -15,8 +15,8 @@ CFLAGS = $(OPTS) $(WARNINGS)
UNINST_PROGRAMS = sizetest.ocfs2
-INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
-DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2CB_FLAT_INCLUDES
CFILES = sizetest.c
OBJS = $(subst .c,.o,$(CFILES))
diff --git a/tunefs.ocfs2/Makefile b/tunefs.ocfs2/Makefile
index acf6cea..719ddbd 100644
--- a/tunefs.ocfs2/Makefile
+++ b/tunefs.ocfs2/Makefile
@@ -25,9 +25,9 @@ LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
sbindir = $(root_sbindir)
SBIN_PROGRAMS = tunefs.ocfs2
-INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include -I.
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include -I.
INCLUDES += $(GLIB_CFLAGS)
-DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2CB_FLAT_INCLUDES
MANS = tunefs.ocfs2.8
--
1.5.2.2
More information about the Ocfs2-tools-devel
mailing list