From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 20 Aug 2007 14:36:18 -0000 Subject: [Cluster-devel] cluster gfs2/mount/Makefile gfs/include/gfs_on ... Message-ID: <20070820143618.8675.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: fabbione at sourceware.org 2007-08-20 14:36:16 Modified files: gfs2/mount : Makefile Removed files: gfs/include : gfs_ondisk.h gfs2/include : gfs_ondisk.h Log message: Remove redundant gfs_ondisk.h from gfs/include/ and gfs2/include/ both files are outdated compared to the one shipped in gfs-kernel/src/gfs/gfs_ondisk.h and there should be no need of duplicates around the tree. gfs and gfs2 both use to include gfskincdir that is enough to guarantee that gfs_ondisk.h will be available at build time. gfs2/mount/Makefile requires this one liner. I spotted that we try to include gfs2kincdir that we never set and therefor it was failing to build without a local copy of gfs_ondisk.h Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/include/gfs_ondisk.h.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/include/gfs_ondisk.h.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15 --- cluster/gfs2/mount/Makefile 2007/06/01 09:45:34 1.14 +++ cluster/gfs2/mount/Makefile 2007/08/20 14:36:16 1.15 @@ -26,7 +26,7 @@ CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -DGFS2_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE CFLAGS += -O2 -CFLAGS += -I${gfs2kincdir} -I${gfskincdir} +CFLAGS += -I${gfskincdir} CFLAGS += -I../include CFLAGS += -I${incdir}