PERFORCE change 85237 for review

[soc-chenk]

http://perforce.freebsd.org/chv.cgi?CH=85237

Change 85237 by soc-chenk at soc-chenk_leavemealone on 2005/10/13 22:02:29

	Makefile tunings
	- Merge in Anish Mistry's patch for mount_fusefs/Makefile
	- fuse_module/Makefile:
	  - no invariants by default
	  - add (non-automated support) for using old clonehandler API
	  - update README.html accordingly
	Submitted by:	soc-chenk

Affected files ...

.. //depot/projects/soc2005/fuse4bsd2/README.html#9 edit
.. //depot/projects/soc2005/fuse4bsd2/fuse_module/Makefile#4 edit
.. //depot/projects/soc2005/fuse4bsd2/mount_fusefs/Makefile#4 edit

Differences ...

==== //depot/projects/soc2005/fuse4bsd2/README.html#9 (text+ko) ====

@@ -32,7 +32,7 @@
 The main part of Fuse for FreeBSD is a kernel module which provides a kernel messaging interface to the Fuse library in userspace which is compatible with that of the Linux module. The userspace part is pretty portable. A lightweight patch is enough to get that compile and work. 
 </p>
 <p>
-The module can be expected work with RELENG_6 snapshots of version number at least <strong>600034</strong>, or with HEAD snapshots of version number at least <strong>700002</strong>. (<em>Hint:</em> you can get the version number of your currently running kernel by <tt>sysctl&nbsp;-n&nbsp;kern.osreldate</tt>; or you can extract the version number directly from the source code by <tt>awk&nbsp;'/#define/{if&nbsp;($2&nbsp;==&nbsp;"__FreeBSD_version")&nbsp;{&nbsp;print&nbsp;$3;&nbsp;exit&nbsp;}}'&nbsp;/sys/sys/param.h</tt>.) (Desperate types can try with older HEAD/RELENG_6 snapshots if they set the <tt>-DUSE_OLD_CLONEHANDLER_API</tt> flag for <tt>cc</tt>.) 
+The module can be excepted to work with RELENG_6 and HEAD (ie., 7.x) snapshots. 
 </p>
 <p>
 What can be considered as a public homepage for the project is  <a class="external" href="http://wikitest.freebsd.org/moin.cgi/FuseFilesystem"><img src="/classic/img/moin-www.png" alt="[WWW]" height="11" width="11">http://wikitest.freebsd.org/moin.cgi/FuseFilesystem</a>; for updates, further info go there. Get in contact with me via the <tt>soc-chenk</tt> email addrees of the FreeBSD organization (<tt>freebsd.org</tt>). 
@@ -88,6 +88,12 @@
 </li>
     <li>
 <p>
+ For older snapshots, you'll need a special make flag. If you use a 6.x kernel and its <tt>__FreeBSD_version</tt> is lesser than  <tt>600034</tt>, or you use a 7.x kernel and its <tt>__FreeBSD_version</tt> is lesser than <tt>700002</tt>, you will also have to add  <tt>-DUSE_OLD_CLONEHANDLER_API</tt> to <tt>make</tt>'s parameters below. You can check this variable by the   
+<pre> awk '/#define/{if ($2 == "__FreeBSD_version") { print $3; exit }}' /sys/sys/param.h</pre> command. 
+</p>
+</li>
+    <li>
+<p>
  Type <tt>make</tt>. If you want normal quantity of debug output, use the make flag <tt>-DDEBUG2G</tt>, if you want tons of debug output,  use <tt>-DDEBUG</tt>. 
 </p>
 </li>

==== //depot/projects/soc2005/fuse4bsd2/fuse_module/Makefile#4 (text+ko) ====

@@ -5,6 +5,14 @@
 CFLAGS+= -DFMASTER
 .endif
 
+.if defined(USE_OLD_CLONEHANDLER_API)
+CFLAGS+= -DUSE_OLD_CLONEHANDLER_API
+.endif
+
+.if defined(INVARIANTS)
+CFLAGS+= -DINVARIANTS
+.endif
+
 .if defined(DEBUG)
 DEBUG_FLAGS+= -D_DEBUG -g
 .endif
@@ -14,17 +22,13 @@
 .endif
 
 .if defined(DEBUG_MSGING)
-CFLAGS+= -D_DEBUG_MSGING
+DEBUG_FLAGS+= -D_DEBUG_MSGING
 .endif
 
 .if defined(FMASTER) || defined(DEBUG) || defined(DEBUG2G)
 SRCS+= fuse_opnames.c
 .endif
 
-.if !defined(NOINVARIANTS)
-CFLAGS+= -DINVARIANTS
-.endif
-
 KMOD=fuse
 
 CLEANFILES+= fuse_kernel.h fuse_opnames.c fuse_opnames.o fmaster.o vnode_if.h vnode_if_typedef.h vnode_if_newproto.h fuse.ko.debug

==== //depot/projects/soc2005/fuse4bsd2/mount_fusefs/Makefile#4 (text+ko) ====

@@ -2,7 +2,8 @@
 
 PROG = mount_fusefs
 SRCS = mount_fusefs.c getmntopts.c
-MAN  = mount_fusefs.8
+MAN8  = mount_fusefs.8
+NO_MANCOMPRESS?=	yes
 CLEANFILES +=  mount_fusefs_safe mount_fusefs_safe.o mount_fusefs_safe.c
 
 # mount_fusefs needs mntopts.h and getmntopts.c from src/sbin/mount/