[Ocfs2-tools-commits] manish commits r540 - in trunk: fswreck mkfs.ocfs2 mounted.ocfs2 ocfs2tool tunefs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-07 18:01:52 -0600 (Fri, 07 Jan 2005)
New Revision: 540

Modified:
   trunk/fswreck/Makefile
   trunk/mkfs.ocfs2/Makefile
   trunk/mounted.ocfs2/Makefile
   trunk/ocfs2tool/Makefile
   trunk/tunefs.ocfs2/Makefile
Log:
Add proper dependencies for libocfs2.a


Modified: trunk/fswreck/Makefile
===================================================================
--- trunk/fswreck/Makefile	2005-01-06 01:47:27 UTC (rev 539)
+++ trunk/fswreck/Makefile	2005-01-08 00:01:52 UTC (rev 540)
@@ -26,8 +26,9 @@
 OBJS = $(subst .c,.o,$(CFILES))
 
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
-fswreck: $(OBJS)
+fswreck: $(OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/mkfs.ocfs2/Makefile
===================================================================
--- trunk/mkfs.ocfs2/Makefile	2005-01-06 01:47:27 UTC (rev 539)
+++ trunk/mkfs.ocfs2/Makefile	2005-01-08 00:01:52 UTC (rev 540)
@@ -15,6 +15,7 @@
 
 LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
 INCLUDES = $(LIBOCFS2_CFLAGS) -I.
 DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
@@ -30,7 +31,7 @@
 
 DIST_FILES = $(CFILES) mkfs.ocfs2.8.in
 
-mkfs.ocfs2: $(OBJS)
+mkfs.ocfs2: $(OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
 readdir: readdir.o

Modified: trunk/mounted.ocfs2/Makefile
===================================================================
--- trunk/mounted.ocfs2/Makefile	2005-01-06 01:47:27 UTC (rev 539)
+++ trunk/mounted.ocfs2/Makefile	2005-01-08 00:01:52 UTC (rev 540)
@@ -12,6 +12,7 @@
 CFLAGS = $(OPTS) $(WARNINGS) 
 
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
 SBIN_PROGRAMS = mounted.ocfs2
 
@@ -26,7 +27,7 @@
 
 DIST_FILES = $(CFILES)
 
-mounted.ocfs2: $(OBJS)
+mounted.ocfs2: $(OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/ocfs2tool/Makefile
===================================================================
--- trunk/ocfs2tool/Makefile	2005-01-06 01:47:27 UTC (rev 539)
+++ trunk/ocfs2tool/Makefile	2005-01-08 00:01:52 UTC (rev 540)
@@ -13,6 +13,7 @@
 
 LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
 DEFINES = -DOCFS2_FLAT_INCLUDES -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
 INCLUDES = $(LIBOCFS2_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTK_CFLAGS)
@@ -73,7 +74,7 @@
 	--override cellmap.override \
 	cellmap.defs > $@
 
-ocfs2module.so: $(OBJS)
+ocfs2module.so: $(OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) -shared $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) $(GTK_LIBS)
 
 install-pylib:

Modified: trunk/tunefs.ocfs2/Makefile
===================================================================
--- trunk/tunefs.ocfs2/Makefile	2005-01-06 01:47:27 UTC (rev 539)
+++ trunk/tunefs.ocfs2/Makefile	2005-01-08 00:01:52 UTC (rev 540)
@@ -14,6 +14,7 @@
 CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS) 
 
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
 SBIN_PROGRAMS = tunefs.ocfs2
 
@@ -36,7 +37,7 @@
 
 DIST_FILES = $(CFILES)
 
-tunefs.ocfs2: $(OBJS)
+tunefs.ocfs2: $(OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
 include $(TOPDIR)/Postamble.make