[Cluster-devel] cluster/gfs/gfs_jadd Makefile main.c

[rpeterso at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2006-07-10 23:35:48

Modified files:
	gfs/gfs_jadd   : Makefile main.c 

Log message:
	Changes necessary due to removal of iddev parts (replaced by libvolume_id)
	Also incorporated libgfs for common functions.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/main.c.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- cluster/gfs/gfs_jadd/Makefile	2005/05/19 19:51:07	1.4
+++ cluster/gfs/gfs_jadd/Makefile	2006/07/10 23:35:48	1.5
@@ -22,8 +22,8 @@
 CFLAGS+= -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 \
 	-DGFS_RELEASE_NAME=\"${RELEASE}\"
 
-INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config \
-	-I${gfskincdir} -I${iddevincdir} -I${incdir}
+INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config -I${top_srcdir}/libgfs\
+	-I${gfskincdir} -I${incdir}
 
 ifneq (${KERNEL_SRC}, )
 # Use the kernel tree if patched, otherwise, look where cluster headers
@@ -35,8 +35,8 @@
 INCLUDE += -I${incdir}
 endif
 
-LDFLAGS+= -L${iddevlibdir} -L${libdir}
-LOADLIBES+= -liddev
+LDFLAGS+= -L${libdir} -L${top_srcdir}/libgfs
+LOADLIBES+= -lgfs
 
 all: ${TARGET}
 
--- cluster/gfs/gfs_jadd/main.c	2005/01/04 10:07:08	1.3
+++ cluster/gfs/gfs_jadd/main.c	2006/07/10 23:35:48	1.4
@@ -28,8 +28,7 @@
 #define __user
 #include <linux/gfs_ioctl.h>
 #include "osi_list.h"
-typedef uint64_t uint64;
-#include "iddev.h"
+#include "libgfs.h"
 
 #include "copyright.cf"