[Ocfs-tools-commits] smushran commits r67 - in trunk/ocfs: bugfix debugocfs fsck

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2004-06-16 13:50:03 -0500 (Wed, 16 Jun 2004)
New Revision: 67

Modified:
   trunk/ocfs/bugfix/Makefile
   trunk/ocfs/debugocfs/Makefile
   trunk/ocfs/fsck/Makefile
Log:
makefiles fixed

Modified: trunk/ocfs/bugfix/Makefile
===================================================================
--- trunk/ocfs/bugfix/Makefile	2004-06-16 00:47:42 UTC (rev 66)
+++ trunk/ocfs/bugfix/Makefile	2004-06-16 18:50:03 UTC (rev 67)
@@ -15,7 +15,7 @@
 
 SBIN_PROGRAMS = bug3016598 bug3123542
 
-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
 
 OPTIMIZE = -O2
@@ -50,10 +50,10 @@
 DIST_RULES = dist-incdir
 
 bug3016598: bug3016598.o ver.o generic.o
-	$(LINK) -L$(TOPDIR)/libocfs -locfs
+	$(LINK) -L$(TOPDIR)/ocfs/libocfs -locfs
 
 bug3123542: bug3123542.o ver.o generic.o
-	$(LINK) -L$(TOPDIR)/libocfs -locfs
+	$(LINK) -L$(TOPDIR)/ocfs/libocfs -locfs
 
 dist-incdir:
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/inc

Modified: trunk/ocfs/debugocfs/Makefile
===================================================================
--- trunk/ocfs/debugocfs/Makefile	2004-06-16 00:47:42 UTC (rev 66)
+++ trunk/ocfs/debugocfs/Makefile	2004-06-16 18:50:03 UTC (rev 67)
@@ -59,7 +59,7 @@
 	$(LINK) $(GLIB_LIBS) -lglib 
 
 debugocfs: print.o debugocfs.o io.o main.o ../libocfs/libocfs.a
-	$(LINK) -pthread -L$(TOPDIR)/libocfs -locfs
+	$(LINK) -pthread -L$(TOPDIR)/ocfs/libocfs -locfs
 
 dbg.o: debugocfs.c
 	$(CC) $(CFLAGS) $(INCLUDES) $(GTK_CFLAGS) -DLIBDEBUGOCFS $(DEFINES) -o $@ -c $<

Modified: trunk/ocfs/fsck/Makefile
===================================================================
--- trunk/ocfs/fsck/Makefile	2004-06-16 00:47:42 UTC (rev 66)
+++ trunk/ocfs/fsck/Makefile	2004-06-16 18:50:03 UTC (rev 67)
@@ -4,7 +4,7 @@
 
 MANS = fsck.ocfs.8
 
-SBIN_PROGRAMS = fsck.ocfs blked.ocfs
+SBIN_PROGRAMS = fsck.ocfs blked.ocfs parse classes.c
 DIST_FILES = mkgetconst fsck.h classes.h  defaults.h fsck_print.h layout.h sig.h verify.h mkgetconst classes.c parse fsck.ocfs.8.in
 
 ifdef OCFS_DEBUG