[Ocfs2-tools-commits] jlbec commits r484 - in trunk: . clusterbo debugfs.ocfs2 extras fsck.ocfs2 libocfs2 listuuid mkfs.ocfs2 mount.ocfs2 mounted.ocfs2 ocfs2cdsl ocfs2tool tunefs.ocfs2

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Tue Dec 14 13:57:28 CST 2004 

Author: jlbec
Date: 2004-12-14 13:57:26 -0600 (Tue, 14 Dec 2004)
New Revision: 484

Modified:
   trunk/Makefile
   trunk/clusterbo/
   trunk/clusterbo/Makefile
   trunk/debugfs.ocfs2/
   trunk/extras/
   trunk/fsck.ocfs2/
   trunk/libocfs2/
   trunk/libocfs2/Makefile
   trunk/listuuid/
   trunk/mkfs.ocfs2/
   trunk/mount.ocfs2/
   trunk/mounted.ocfs2/
   trunk/ocfs2cdsl/
   trunk/ocfs2tool/
   trunk/tunefs.ocfs2/
Log:

o Now that we have -MD, let it handle header deps
o libocfs2 make clean should remove ocfs2_err.[ch].
o Update svn:ignore properties to ignore .d files.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-12-14 19:28:42 UTC (rev 483)
+++ trunk/Makefile	2004-12-14 19:57:26 UTC (rev 484)
@@ -28,10 +28,6 @@
 SUBDIRS += ocfs2cdsl
 endif
 
-#ifdef BUILD_DEBUGOCFS2
-#SUBDIRS += debugfs.ocfs2
-#endif
-
 ifdef BUILD_OCFSTOOL
 SUBDIRS += ocfs2tool
 endif


Property changes on: trunk/clusterbo
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
clusterbo

   + .*.sw?
*.d
clusterbo
o2cb_ctl


Modified: trunk/clusterbo/Makefile
===================================================================
--- trunk/clusterbo/Makefile	2004-12-14 19:28:42 UTC (rev 483)
+++ trunk/clusterbo/Makefile	2004-12-14 19:57:26 UTC (rev 484)
@@ -2,13 +2,17 @@
 
 include $(TOPDIR)/Preamble.make
 
-SBIN_PROGRAMS = clusterbo
+SBIN_PROGRAMS = clusterbo o2cb_ctl
+LIBRARIES = libo2cb.a
 
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include \
 	    -I$(TOPDIR)/libocfs2cluster/include
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
 LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
+LIBO2CB_LIBS  = -L. -lo2cb
+LIBO2CB_DEPS = libo2cb.a
+
 ifdef OCFS_DEBUG
 OPTS += -ggdb
 else
@@ -18,19 +22,39 @@
 CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations
 
-DEFINES = -DOCFS2_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
 
-CFILES =	clusterbo.c
+LIBO2CB_CFILES = o2cb_abi.c
+LIBO2CB_OBJS = $(subst .c,.o,$(LIBO2CB_CFILES))
 
-OBJS = $(subst .c,.o,$(CFILES))
+CLUSTERBO_CFILES = clusterbo.c
+CLUSTERBO_OBJS = $(subst .c,.o,$(CLUSTERBO_CFILES))
 
-DIST_FILES = $(CFILES) 
+O2CB_CTL_CFILES = o2cb_ctl.c o2cb_config.c \
+	jconfig.c jiterator.c
+
+O2CB_CTL_OBJS = $(subst .c,.o,$(O2CB_CTL_CFILES))
+
+HEADERS = jconfig.h jiterator.h
+
+CFILES = $(LIBO2CB_CFILES) $(CLUSTERBO_CFILES) $(O2CB_CTL_CFILES)
+
+DIST_FILES = $(CFILES) $(HEADERS)
 DIST_RULES = dist-subdircreate
 
-dist-subdircreate:
-	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
+o2cb_abi_CFLAGS = -fPIC
+libo2cb.a: $(LIBO2CB_OBJS)
+	rm -f $@
+	$(AR) r $@ $^
+	$(RANLIB) $@
 
-clusterbo: $(OBJS) $(LIBOCFS2_DEPS)
+clusterbo: $(CLUSTERBO_OBJS) $(LIBOCFS2_DEPS)
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
+jconfig_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
+jiterator_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
+o2cb_config_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
+o2cb_ctl: $(O2CB_CTL_OBJS) $(LIBOCFS2_DEPS) $(LIBO2CB_DEPS)
+	$(LINK) $(LIBO2CB_LIBS) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
+
 include $(TOPDIR)/Postamble.make


Property changes on: trunk/debugfs.ocfs2
___________________________________________________________________
Name: svn:ignore
   - cscope.out
debugfs.ocfs2
cscope.files
.*.sw?
debugfs.ocfs2.8
stamp-md5

   + cscope.out
debugfs.ocfs2
cscope.files
.*.sw?
*.d
debugfs.ocfs2.8
stamp-md5



Property changes on: trunk/extras
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
find_hardlinks
find_dup_extents
find_inode_paths
set_random_bits

   + .*.sw?
find_hardlinks
find_dup_extents
find_inode_paths
set_random_bits
*.d



Property changes on: trunk/fsck.ocfs2
___________________________________________________________________
Name: svn:ignore
   - cscope*
stamp-md5
.*.sw?
.*.cmd
fsck.ocfs2
*.8

   + cscope*
stamp-md5
.*.sw?
.*.cmd
fsck.ocfs2
*.8
*.d



Property changes on: trunk/libocfs2
___________________________________________________________________
Name: svn:ignore
   - cscope*
stamp-md5
.*.sw?
.*.cmd
ocfs2_err.c
ocfs2_err.h
libocfs2.a
ocfs2_err.et
debug_*

   + cscope*
stamp-md5
.*.sw?
.*.cmd
ocfs2_err.c
ocfs2_err.h
libocfs2.a
ocfs2_err.et
debug_*
*.d


Modified: trunk/libocfs2/Makefile
===================================================================
--- trunk/libocfs2/Makefile	2004-12-14 19:28:42 UTC (rev 483)
+++ trunk/libocfs2/Makefile	2004-12-14 19:57:26 UTC (rev 484)
@@ -87,7 +87,7 @@
 HFILES_GEN =		\
 	include/ocfs2_err.h
 	
-$(CFILES): $(HFILES) $(HFILES_GEN)
+$(CFILES): $(HFILES_GEN)
 
 OBJS = $(subst .c,.o,$(CFILES)) \
 	ocfs2_err.o
@@ -113,4 +113,9 @@
 dist-subdircreate:
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
 
+CLEAN_RULES = clean-err
+
+clean-err:
+	rm -f ocfs2_err.c ocfs2_err.h include/ocfs2_err.h
+
 include $(TOPDIR)/Postamble.make


Property changes on: trunk/listuuid
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
listuuid

   + .*.sw?
listuuid
*.d



Property changes on: trunk/mkfs.ocfs2
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
stamp-md5
mkfs.ocfs2
cscope*
mkfs.ocfs2.8
tunefs.ocfs2

   + .*.sw?
stamp-md5
mkfs.ocfs2
cscope*
mkfs.ocfs2.8
tunefs.ocfs2
*.d



Property changes on: trunk/mount.ocfs2
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
mount.ocfs2

   + .*.sw?
mount.ocfs2
*.d



Property changes on: trunk/mounted.ocfs2
___________________________________________________________________
Name: svn:ignore
   - mounted.ocfs2
stamp-md5
.*.sw?
cscope.*

   + mounted.ocfs2
stamp-md5
.*.sw?
cscope.*
*.d



Property changes on: trunk/ocfs2cdsl
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
ocfs2cdsl
stamp-md5

   + .*.sw?
ocfs2cdsl
stamp-md5
*.d



Property changes on: trunk/ocfs2tool
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
*.pyc
ocfsmarshal.c
ocfsmarshal.h
cellmap.c
*.so
ocfs2tool.8

   + .*.sw?
*.pyc
ocfsmarshal.c
ocfsmarshal.h
cellmap.c
*.so
ocfs2tool.8
*.d



Property changes on: trunk/tunefs.ocfs2
___________________________________________________________________
Name: svn:ignore
   - cscope*
tunefs.ocfs2
stamp-md5

   + cscope*
tunefs.ocfs2
.*.sw?
stamp-md5
*.d

More information about the Ocfs2-tools-commits mailing list