[Ocfs-tools-commits] manish commits r57 - in trunk/ocfs: debugocfs format fsck

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-13 18:48:55 -0500 (Sun, 13 Jun 2004)
New Revision: 57

Modified:
   trunk/ocfs/debugocfs/Makefile
   trunk/ocfs/format/Makefile
   trunk/ocfs/fsck/Makefile
Log:
Fix up libocfs paths


Modified: trunk/ocfs/debugocfs/Makefile
===================================================================
--- trunk/ocfs/debugocfs/Makefile	2004-06-13 23:44:49 UTC (rev 56)
+++ trunk/ocfs/debugocfs/Makefile	2004-06-13 23:48:55 UTC (rev 57)
@@ -16,7 +16,7 @@
 
 CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS)
 
-INCLUDES = -I. -I$(TOPDIR)/libocfs/Common/inc -I$(TOPDIR)/libocfs/Linux/inc -I$(TOPDIR)/libocfs
+INCLUDES = -I. -I$(TOPDIR)/ocfs/libocfs/Common/inc -I$(TOPDIR)/ocfs/libocfs/Linux/inc -I$(TOPDIR)/ocfs/libocfs
 DEFINES = -DLINUX -DUSERSPACE_TOOL -DDEBUGOCFS
 
 OPTIMIZE = -O2

Modified: trunk/ocfs/format/Makefile
===================================================================
--- trunk/ocfs/format/Makefile	2004-06-13 23:44:49 UTC (rev 56)
+++ trunk/ocfs/format/Makefile	2004-06-13 23:48:55 UTC (rev 57)
@@ -13,7 +13,7 @@
 
 SBIN_PROGRAMS = mkfs.ocfs mounted.ocfs tuneocfs
 
-INCLUDES = -I$(TOPDIR)/libocfs/Common/inc -I$(TOPDIR)/libocfs/Linux/inc -Iinc -I$(TOPDIR)/libocfs
+INCLUDES = -I$(TOPDIR)/ocfs/libocfs/Common/inc -I$(TOPDIR)/ocfs/libocfs/Linux/inc -Iinc -I$(TOPDIR)/ocfs/libocfs
 DEFINES = -DLINUX -DUSERSPACE_TOOL -DFORMAT_OCFS
 
 OPTIMIZE = -O2
@@ -53,16 +53,16 @@
 
 DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) mkfs.ocfs.8.in tuneocfs.8.in
 
-vpath ocfsheartbeat.c $(TOPDIR)/libocfs/Common
+vpath ocfsheartbeat.c $(TOPDIR)/ocfs/libocfs/Common
 
 mkfs.ocfs: format.o frmtport.o journal.o system.o
-	$(LINK) -L$(TOPDIR)/libocfs -locfs
+	$(LINK) -L$(TOPDIR)/ocfs/libocfs -locfs
 
 mounted.ocfs: mounted.o frmtport.o
-	$(LINK) -L$(TOPDIR)/libocfs -locfs
+	$(LINK) -L$(TOPDIR)/ocfs/libocfs -locfs
 
 tuneocfs: tune.o frmtport.o
-	$(LINK) -L$(TOPDIR)/libocfs -locfs
+	$(LINK) -L$(TOPDIR)/ocfs/libocfs -locfs
 
 dist-incdir:
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/inc

Modified: trunk/ocfs/fsck/Makefile
===================================================================
--- trunk/ocfs/fsck/Makefile	2004-06-13 23:44:49 UTC (rev 56)
+++ trunk/ocfs/fsck/Makefile	2004-06-13 23:48:55 UTC (rev 57)
@@ -14,11 +14,11 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wno-format -Wmissing-prototypes \
            -Wmissing-declarations
 
-LIBOCFS_LIBS = -L$(TOPDIR)/libocfs -locfs
-LIBOCFS_CFLAGS = -pthread -I$(TOPDIR)/libocfs
+LIBOCFS_LIBS = -L$(TOPDIR)/ocfs/libocfs -locfs
+LIBOCFS_CFLAGS = -pthread -I$(TOPDIR)/ocfs/libocfs
 
 CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS) $(LIBOCFS_CFLAGS)
-INCLUDES = -I. -I$(TOPDIR)/libocfs/Common/inc -I$(TOPDIR)/libocfs/Linux/inc
+INCLUDES = -I. -I$(TOPDIR)/ocfs/libocfs/Common/inc -I$(TOPDIR)/ocfs/libocfs/Linux/inc
 
 DEFINES = -DLINUX -DUSERSPACE_TOOL -DSHOW_INVALID_VALUES -DFSCK_OCFS
 
@@ -50,7 +50,7 @@
 	gcc $(INCLUDES) -D_GNU_SOURCE parse.c -o $@
 
 classes.c: parse
-	export COMMON_HEADERS=$(TOPDIR)/libocfs/Common/inc; cat $(TOPDIR)/libocfs/Common/inc/ocfsdisk.h $(TOPDIR)/libocfs/Common/inc/ocfsvol.h | ./parse > $@
+	export COMMON_HEADERS=$(TOPDIR)/ocfs/libocfs/Common/inc; cat $(TOPDIR)/ocfs/libocfs/Common/inc/ocfsdisk.h $(TOPDIR)/ocfs/libocfs/Common/inc/ocfsvol.h | ./parse > $@
 
 classes.o: classes.c
 	$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) $(GLIB_CFLAGS) -o $@ -c $<