[Ocfs-tools-commits] jlbec commits r66 - in branches/joel-junk/ocfs2: fsck.ocfs2 libocfs2 libocfs2/include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-15 19:47:42 -0500 (Tue, 15 Jun 2004)
New Revision: 66

Added:
   branches/joel-junk/ocfs2/libocfs2/Makefile
   branches/joel-junk/ocfs2/libocfs2/include/
   branches/joel-junk/ocfs2/libocfs2/include/jfs_compat.h
   branches/joel-junk/ocfs2/libocfs2/include/kernel-jbd.h
   branches/joel-junk/ocfs2/libocfs2/include/kernel-list.h
Modified:
   branches/joel-junk/ocfs2/fsck.ocfs2/
   branches/joel-junk/ocfs2/fsck.ocfs2/Makefile
   branches/joel-junk/ocfs2/libocfs2/
Log:
more foo


Property changes on: branches/joel-junk/ocfs2/fsck.ocfs2
___________________________________________________________________
Name: svn:ignore
   + cscope*
stamp-md5
.*.sw?
.*.cmd


Modified: branches/joel-junk/ocfs2/fsck.ocfs2/Makefile
===================================================================
--- branches/joel-junk/ocfs2/fsck.ocfs2/Makefile	2004-06-16 00:37:50 UTC (rev 65)
+++ branches/joel-junk/ocfs2/fsck.ocfs2/Makefile	2004-06-16 00:47:42 UTC (rev 66)
@@ -13,8 +13,7 @@
 
 SBIN_PROGRAMS = fsck.ocfs2
 
-INCLUDES = -Iinc
-DEFINES = -DLINUX 
+INCLUDES = -I../libocfs2/include
 
 OPTIMIZE = -O2
 


Property changes on: branches/joel-junk/ocfs2/libocfs2
___________________________________________________________________
Name: svn:ignore
   + cscope*
stamp-md5
.*.sw?
.*.cmd


Copied: branches/joel-junk/ocfs2/libocfs2/Makefile (from rev 64, branches/joel-junk/ocfs/libocfs/Makefile)
===================================================================
--- branches/joel-junk/ocfs/libocfs/Makefile	2004-06-16 00:32:44 UTC (rev 64)
+++ branches/joel-junk/ocfs2/libocfs2/Makefile	2004-06-16 00:47:42 UTC (rev 66)
@@ -0,0 +1,59 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+WARNINGS = -Wall -Wstrict-prototypes -Wno-format -Wmissing-prototypes \
+	-Wmissing-declarations
+
+ifdef OCFS_DEBUG
+OPTS += -g
+endif
+
+INCLUDES = -I. -Iinclude
+
+LIBRARIES = libocfs.a
+
+CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS)
+
+OPTIMIZE = -O2
+
+ifeq ($(OCFS_PROCESSOR),ppc64)
+endif
+ifeq ($(OCFS_PROCESSOR),x86_64)
+  CFLAGS += -m64
+endif
+ifeq ($(OCFS_PROCESSOR),ia64)
+endif
+ifeq ($(OCFS_PROCESSOR),i686)
+  DEFINES += -D__ILP32__
+endif
+
+CFLAGS += $(OPTIMIZE)
+
+CFILES = 		\
+	mounted.c	\
+
+HFILES =				\
+	include/kernel-jbh.h		\
+	include/kernel-list.h		\
+	include/ocfs2_fs.h		\
+	include/ocfs1_fs_compat.h
+	
+
+$(CFILES): $(HFILES)
+
+OBJS = $(subst .c,.o,$(CFILES))
+
+libocfs.a: $(OBJS)
+	rm -f $@
+	$(AR) r $@ $^
+	$(RANLIB) $@
+
+DIST_FILES = $(CFILES) $(HFILES)
+
+DIST_RULES = dist-subdircreate
+
+dist-subdircreate:
+	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
+
+include $(TOPDIR)/Postamble.make


Property changes on: branches/joel-junk/ocfs2/libocfs2/include
___________________________________________________________________
Name: svn:ignore
   + cscope*
stamp-md5
.*.sw?
.*.cmd


Copied: branches/joel-junk/ocfs2/libocfs2/include/jfs_compat.h (from rev 64, branches/joel-junk/ocfs2/format/inc/jfs_compat.h)

Copied: branches/joel-junk/ocfs2/libocfs2/include/kernel-jbd.h (from rev 64, branches/joel-junk/ocfs2/format/inc/kernel-jbd.h)

Copied: branches/joel-junk/ocfs2/libocfs2/include/kernel-list.h (from rev 64, branches/joel-junk/ocfs2/format/inc/kernel-list.h)