Module Name: othersrc Committed By: stacktic Date: Tue Mar 24 15:14:24 UTC 2009
Modified Files: othersrc: Makefile othersrc/bin: Makefile.inc othersrc/bin/fsu_cat: Makefile othersrc/bin/fsu_chmod: Makefile othersrc/bin/fsu_console: Makefile othersrc/bin/fsu_cp: Makefile othersrc/bin/fsu_diff: Makefile othersrc/bin/fsu_ecp: Makefile othersrc/bin/fsu_exec: Makefile othersrc/bin/fsu_find: Makefile othersrc/bin/fsu_ln: Makefile othersrc/bin/fsu_ls: Makefile othersrc/bin/fsu_mkdir: Makefile othersrc/bin/fsu_mv: Makefile othersrc/bin/fsu_rm: Makefile othersrc/bin/fsu_rmdir: Makefile othersrc/bin/fsu_write: Makefile othersrc/lib: Makefile.inc othersrc/lib/libfsu_mount: Makefile fsu_mount.c othersrc/lib/libfsu_utils: Makefile fsu_dir.c fsu_file.c fsu_fts.c fsu_str2arg.c fts2fsufts.h othersrc/sbin: Makefile.inc othersrc/sbin/fsu_mknod: Makefile othersrc/usr.bin: Makefile.inc othersrc/usr.bin/fsu_chflags: Makefile othersrc/usr.bin/fsu_du: Makefile othersrc/usr.bin/fsu_mkfifo: Makefile othersrc/usr.bin/fsu_touch: Makefile othersrc/usr.sbin/fsu_chown: Makefile Added Files: othersrc: Makefile.fsu Log Message: Makefile refactoring To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 othersrc/Makefile cvs rdiff -u -r0 -r1.1 othersrc/Makefile.fsu cvs rdiff -u -r1.1 -r1.2 othersrc/bin/Makefile.inc cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_cat/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_chmod/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_console/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_cp/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_diff/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_ecp/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_exec/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_find/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_ln/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_ls/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_mkdir/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_mv/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_rm/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_rmdir/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/bin/fsu_write/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/lib/Makefile.inc cvs rdiff -u -r1.1 -r1.2 othersrc/lib/libfsu_mount/Makefile cvs rdiff -u -r1.2 -r1.3 othersrc/lib/libfsu_mount/fsu_mount.c cvs rdiff -u -r1.1 -r1.2 othersrc/lib/libfsu_utils/Makefile \ othersrc/lib/libfsu_utils/fsu_dir.c othersrc/lib/libfsu_utils/fsu_file.c \ othersrc/lib/libfsu_utils/fsu_fts.c \ othersrc/lib/libfsu_utils/fsu_str2arg.c \ othersrc/lib/libfsu_utils/fts2fsufts.h cvs rdiff -u -r1.1 -r1.2 othersrc/sbin/Makefile.inc cvs rdiff -u -r1.1 -r1.2 othersrc/sbin/fsu_mknod/Makefile cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/Makefile.inc cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_chflags/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_du/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_mkfifo/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/fsu_touch/Makefile cvs rdiff -u -r1.1 -r1.2 othersrc/usr.sbin/fsu_chown/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: othersrc/Makefile diff -u othersrc/Makefile:1.2 othersrc/Makefile:1.3 --- othersrc/Makefile:1.2 Mon Mar 23 21:03:56 2009 +++ othersrc/Makefile Tue Mar 24 15:14:22 2009 @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.2 2009/03/23 21:03:56 stacktic Exp $ +# $NetBSD: Makefile,v 1.3 2009/03/24 15:14:22 stacktic Exp $ -SUBDIR= lib bin sbin usr.bin usr.sbin +SUBDIR= lib .WAIT bin sbin usr.bin usr.sbin .include <bsd.subdir.mk> Index: othersrc/bin/Makefile.inc diff -u othersrc/bin/Makefile.inc:1.1 othersrc/bin/Makefile.inc:1.2 --- othersrc/bin/Makefile.inc:1.1 Mon Mar 23 21:03:56 2009 +++ othersrc/bin/Makefile.inc Tue Mar 24 15:14:22 2009 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.1 2009/03/23 21:03:56 stacktic Exp $ +# $NetBSD: Makefile.inc,v 1.2 2009/03/24 15:14:22 stacktic Exp $ WARNS?= 1 BINDIR?=/usr/local/bin MANDIR?=/usr/local/man # Eventually, this may move to the main tree, as: #BINDIR?=/bin -MKMAN= no Index: othersrc/bin/fsu_cat/Makefile diff -u othersrc/bin/fsu_cat/Makefile:1.1 othersrc/bin/fsu_cat/Makefile:1.2 --- othersrc/bin/fsu_cat/Makefile:1.1 Mon Mar 23 21:03:56 2009 +++ othersrc/bin/fsu_cat/Makefile Tue Mar 24 15:14:22 2009 @@ -1,20 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:56 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:22 stacktic Exp $ # PROG= fsu_cat MAN= fsu_cat.1 -DPADD+= ${LIBUTIL} - -CFLAGS+= -Wl,--wrap=chmod,--wrap=lchmod - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_chmod/Makefile diff -u othersrc/bin/fsu_chmod/Makefile:1.1 othersrc/bin/fsu_chmod/Makefile:1.2 --- othersrc/bin/fsu_chmod/Makefile:1.1 Mon Mar 23 21:03:56 2009 +++ othersrc/bin/fsu_chmod/Makefile Tue Mar 24 15:14:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:56 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:22 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -11,13 +11,5 @@ CFLAGS+= -Wl,--wrap=chmod,--wrap=lchmod -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_console/Makefile diff -u othersrc/bin/fsu_console/Makefile:1.1 othersrc/bin/fsu_console/Makefile:1.2 --- othersrc/bin/fsu_console/Makefile:1.1 Mon Mar 23 21:03:56 2009 +++ othersrc/bin/fsu_console/Makefile Tue Mar 24 15:14:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:56 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:22 stacktic Exp $ # PROG= fsu_console @@ -6,19 +6,8 @@ SRCS= main.c fsu_console.c commands.c LDADD+= -lutil -CPPFLAGS+= -I../fsu_write NOMAN= #defined -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_cp/Makefile diff -u othersrc/bin/fsu_cp/Makefile:1.1 othersrc/bin/fsu_cp/Makefile:1.2 --- othersrc/bin/fsu_cp/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_cp/Makefile Tue Mar 24 15:14:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:22 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= cp.c utils.c MAN= fsu_cp.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_diff/Makefile diff -u othersrc/bin/fsu_diff/Makefile:1.1 othersrc/bin/fsu_diff/Makefile:1.2 --- othersrc/bin/fsu_diff/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_diff/Makefile Tue Mar 24 15:14:22 2009 @@ -1,18 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:22 stacktic Exp $ # PROG= fsu_diff NOMAN= #defined -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_ecp/Makefile diff -u othersrc/bin/fsu_ecp/Makefile:1.1 othersrc/bin/fsu_ecp/Makefile:1.2 --- othersrc/bin/fsu_ecp/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_ecp/Makefile Tue Mar 24 15:14:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:22 stacktic Exp $ # PROG= fsu_ecp @@ -7,15 +7,5 @@ LINKS= ${BINDIR}/fsu_ecp ${BINDIR}/fsu_put LINKS+= ${BINDIR}/fsu_ecp ${BINDIR}/fsu_get -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_exec/Makefile diff -u othersrc/bin/fsu_exec/Makefile:1.1 othersrc/bin/fsu_exec/Makefile:1.2 --- othersrc/bin/fsu_exec/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_exec/Makefile Tue Mar 24 15:14:23 2009 @@ -1,18 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # PROG= fsu_exec NOMAN= #defined -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_find/Makefile diff -u othersrc/bin/fsu_find/Makefile:1.1 othersrc/bin/fsu_find/Makefile:1.2 --- othersrc/bin/fsu_find/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_find/Makefile Tue Mar 24 15:14:23 2009 @@ -1,18 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # PROG= fsu_find NOMAN= #defined -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_ln/Makefile diff -u othersrc/bin/fsu_ln/Makefile:1.1 othersrc/bin/fsu_ln/Makefile:1.2 --- othersrc/bin/fsu_ln/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_ln/Makefile Tue Mar 24 15:14:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,17 +7,7 @@ SRCS= ln.c MAN= fsu_ln.1 -DPADD+= ${LIBUTIL} - CFLAGS+= -Wl,--wrap=link,--wrap=symlink -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_ls/Makefile diff -u othersrc/bin/fsu_ls/Makefile:1.1 othersrc/bin/fsu_ls/Makefile:1.2 --- othersrc/bin/fsu_ls/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_ls/Makefile Tue Mar 24 15:14:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= cmp.c ls.c main.c print.c util.c MAN= fsu_ls.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_mkdir/Makefile diff -u othersrc/bin/fsu_mkdir/Makefile:1.1 othersrc/bin/fsu_mkdir/Makefile:1.2 --- othersrc/bin/fsu_mkdir/Makefile:1.1 Mon Mar 23 21:03:57 2009 +++ othersrc/bin/fsu_mkdir/Makefile Tue Mar 24 15:14:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:57 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= mkdir.c MAN= fsu_mkdir.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_mv/Makefile diff -u othersrc/bin/fsu_mv/Makefile:1.1 othersrc/bin/fsu_mv/Makefile:1.2 --- othersrc/bin/fsu_mv/Makefile:1.1 Mon Mar 23 21:03:58 2009 +++ othersrc/bin/fsu_mv/Makefile Tue Mar 24 15:14:23 2009 @@ -1,18 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:58 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # PROG= fsu_mv MAN= fsu_mv.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_rm/Makefile diff -u othersrc/bin/fsu_rm/Makefile:1.1 othersrc/bin/fsu_rm/Makefile:1.2 --- othersrc/bin/fsu_rm/Makefile:1.1 Mon Mar 23 21:03:58 2009 +++ othersrc/bin/fsu_rm/Makefile Tue Mar 24 15:14:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:58 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= rm.c MAN= fsu_rm.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_rmdir/Makefile diff -u othersrc/bin/fsu_rmdir/Makefile:1.1 othersrc/bin/fsu_rmdir/Makefile:1.2 --- othersrc/bin/fsu_rmdir/Makefile:1.1 Mon Mar 23 21:03:58 2009 +++ othersrc/bin/fsu_rmdir/Makefile Tue Mar 24 15:14:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:58 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # @@ -7,15 +7,5 @@ SRCS= rmdir.c MAN= fsu_rmdir.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/bin/fsu_write/Makefile diff -u othersrc/bin/fsu_write/Makefile:1.1 othersrc/bin/fsu_write/Makefile:1.2 --- othersrc/bin/fsu_write/Makefile:1.1 Mon Mar 23 21:03:58 2009 +++ othersrc/bin/fsu_write/Makefile Tue Mar 24 15:14:23 2009 @@ -1,18 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:58 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # PROG= fsu_write NOMAN= #defined -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/lib/Makefile.inc diff -u othersrc/lib/Makefile.inc:1.1 othersrc/lib/Makefile.inc:1.2 --- othersrc/lib/Makefile.inc:1.1 Mon Mar 23 20:54:12 2009 +++ othersrc/lib/Makefile.inc Tue Mar 24 15:14:23 2009 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.1 2009/03/23 20:54:12 stacktic Exp $ +# $NetBSD: Makefile.inc,v 1.2 2009/03/24 15:14:23 stacktic Exp $ WARNS?= 1 LIBDIR?=/usr/local/lib MANDIR?=/usr/local/man +INCSDIR?=/usr/local/include # Eventually, this may move to the main tree, as: #LIBDIR?=/usr/lib MKMAN=no Index: othersrc/lib/libfsu_mount/Makefile diff -u othersrc/lib/libfsu_mount/Makefile:1.1 othersrc/lib/libfsu_mount/Makefile:1.2 --- othersrc/lib/libfsu_mount/Makefile:1.1 Mon Mar 23 20:54:13 2009 +++ othersrc/lib/libfsu_mount/Makefile Tue Mar 24 15:14:23 2009 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 20:54:13 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:23 stacktic Exp $ # WARNS?= 4 -INCSDIR= ${PREFIX}/include MKLINT= no MKHTML= no @@ -13,6 +12,7 @@ mount_lfs.c mount_ntfs.c mount_udf.c pathadj.c fattr.c INCS= fsu_mount.h +MAN= fsu_mount.3 .ifdef WITH_SYSPUFFS SRCS+= rump_syspuffs.c @@ -21,9 +21,8 @@ #CPPFLAGS+= -DCOMPAT_50 -CPPFLAGS+= -DMOUNT_NOMAIN -DUSE_UKFS -I../libfsu_utils +CPPFLAGS+= -DMOUNT_NOMAIN -DUSE_UKFS -I${INCSDIR} LDFLAGS+= -lrump -MAN= fsu_mount.3 SHLIB_MAJOR= 0 SHLIB_MINOR= 0 Index: othersrc/lib/libfsu_mount/fsu_mount.c diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.2 othersrc/lib/libfsu_mount/fsu_mount.c:1.3 --- othersrc/lib/libfsu_mount/fsu_mount.c:1.2 Tue Mar 24 09:04:14 2009 +++ othersrc/lib/libfsu_mount/fsu_mount.c Tue Mar 24 15:14:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_mount.c,v 1.2 2009/03/24 09:04:14 stacktic Exp $ */ +/* $NetBSD: fsu_mount.c,v 1.3 2009/03/24 15:14:23 stacktic Exp $ */ /* * Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved. @@ -59,7 +59,7 @@ #include "rump_syspuffs.h" #endif -#include "fsu_mount.h" +#include <fsu_mount.h> #define MAX_MNT_ARGS (15) @@ -429,11 +429,13 @@ if (al->fsa_mntopt != NULL) { mntd.mntd_argv[mntd.mntd_argc++] = strdup("-o"); mntd.mntd_argv[mntd.mntd_argc++] = al->fsa_mntopt; + setenv("FSU_MNTOPTS", al->fsa_mntopt, 1); } if (mntopts != NULL) { mntd.mntd_argv[mntd.mntd_argc++] = strdup("-o"); mntd.mntd_argv[mntd.mntd_argc++] = mntopts; + setenv("FSU_MNTOPTS", mntopts, 1); } mntd.mntd_argv[mntd.mntd_argc++] = al->fsa_path; @@ -456,7 +458,7 @@ mntd.mntd_flags, cur->fs_args, cur->fs_args_size); } - + if (cur->fs_name != NULL) fstype = strdup(cur->fs_name); return ukfs; Index: othersrc/lib/libfsu_utils/Makefile diff -u othersrc/lib/libfsu_utils/Makefile:1.1 othersrc/lib/libfsu_utils/Makefile:1.2 --- othersrc/lib/libfsu_utils/Makefile:1.1 Mon Mar 23 20:54:13 2009 +++ othersrc/lib/libfsu_utils/Makefile Tue Mar 24 15:14:24 2009 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 20:54:13 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # WARNS?= 4 -INCSDIR= ${PREFIX}/include MKLINT= no MKHTML= no @@ -28,6 +27,8 @@ fsu_fts.3 fsu_fts_set.3 \ fsu_fts.3 fsu_fts_close.3 +CFLAGS+= -I${INCSDIR} + SHLIB_MAJOR= 0 SHLIB_MINOR= 0 Index: othersrc/lib/libfsu_utils/fsu_dir.c diff -u othersrc/lib/libfsu_utils/fsu_dir.c:1.1 othersrc/lib/libfsu_utils/fsu_dir.c:1.2 --- othersrc/lib/libfsu_utils/fsu_dir.c:1.1 Mon Mar 23 20:54:13 2009 +++ othersrc/lib/libfsu_utils/fsu_dir.c Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_dir.c,v 1.1 2009/03/23 20:54:13 stacktic Exp $ */ +/* $NetBSD: fsu_dir.c,v 1.2 2009/03/24 15:14:24 stacktic Exp $ */ /* * Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved. @@ -35,7 +35,7 @@ #include <rump/ukfs.h> -#include "fsu_utils.h" +#include <fsu_utils.h> static char *fsu_getdirname(struct ukfs *); Index: othersrc/lib/libfsu_utils/fsu_file.c diff -u othersrc/lib/libfsu_utils/fsu_file.c:1.1 othersrc/lib/libfsu_utils/fsu_file.c:1.2 --- othersrc/lib/libfsu_utils/fsu_file.c:1.1 Mon Mar 23 20:54:13 2009 +++ othersrc/lib/libfsu_utils/fsu_file.c Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_file.c,v 1.1 2009/03/23 20:54:13 stacktic Exp $ */ +/* $NetBSD: fsu_file.c,v 1.2 2009/03/24 15:14:24 stacktic Exp $ */ /* * Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved. @@ -36,7 +36,7 @@ #include <rump/ukfs.h> -#include "fsu_utils.h" +#include <fsu_utils.h> static void fsu_fill_buffer(FSU_FILE *); Index: othersrc/lib/libfsu_utils/fsu_fts.c diff -u othersrc/lib/libfsu_utils/fsu_fts.c:1.1 othersrc/lib/libfsu_utils/fsu_fts.c:1.2 --- othersrc/lib/libfsu_utils/fsu_fts.c:1.1 Mon Mar 23 20:54:14 2009 +++ othersrc/lib/libfsu_utils/fsu_fts.c Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_fts.c,v 1.1 2009/03/23 20:54:14 stacktic Exp $ */ +/* $NetBSD: fsu_fts.c,v 1.2 2009/03/24 15:14:24 stacktic Exp $ */ /* from */ /* NetBSD: fts.c,v 1.38 2009/02/28 14:34:18 pgoyette Exp */ @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #else -__RCSID("$NetBSD: fsu_fts.c,v 1.1 2009/03/23 20:54:14 stacktic Exp $"); +__RCSID("$NetBSD: fsu_fts.c,v 1.2 2009/03/24 15:14:24 stacktic Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -59,8 +59,8 @@ #include <rump/ukfs.h> -#include "fsu_utils.h" -#include "fsu_fts.h" +#include <fsu_utils.h> +#include <fsu_fts.h> #if ! HAVE_NBTOOL_CONFIG_H #define HAVE_STRUCT_DIRENT_D_NAMLEN Index: othersrc/lib/libfsu_utils/fsu_str2arg.c diff -u othersrc/lib/libfsu_utils/fsu_str2arg.c:1.1 othersrc/lib/libfsu_utils/fsu_str2arg.c:1.2 --- othersrc/lib/libfsu_utils/fsu_str2arg.c:1.1 Mon Mar 23 20:54:14 2009 +++ othersrc/lib/libfsu_utils/fsu_str2arg.c Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_str2arg.c,v 1.1 2009/03/23 20:54:14 stacktic Exp $ */ +/* $NetBSD: fsu_str2arg.c,v 1.2 2009/03/24 15:14:24 stacktic Exp $ */ /* * Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved. @@ -30,7 +30,7 @@ #include <stdio.h> #include <string.h> -#include "fsu_utils.h" +#include <fsu_utils.h> /* * get argc and argv from a string Index: othersrc/lib/libfsu_utils/fts2fsufts.h diff -u othersrc/lib/libfsu_utils/fts2fsufts.h:1.1 othersrc/lib/libfsu_utils/fts2fsufts.h:1.2 --- othersrc/lib/libfsu_utils/fts2fsufts.h:1.1 Mon Mar 23 20:54:14 2009 +++ othersrc/lib/libfsu_utils/fts2fsufts.h Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fts2fsufts.h,v 1.1 2009/03/23 20:54:14 stacktic Exp $ */ +/* $NetBSD: fts2fsufts.h,v 1.2 2009/03/24 15:14:24 stacktic Exp $ */ /* * Copyright (c) 2008 Arnaud Ysmal. All Rights Reserved. @@ -28,7 +28,7 @@ #ifndef _FSU_FTS2FSUFTS_H_ #define _FSU_FTS2FSUFTS_H_ -#include "fsu_fts.h" +#include <fsu_fts.h> #define FTSENT FSU_FTSENT #define FTS FSU_FTS Index: othersrc/sbin/Makefile.inc diff -u othersrc/sbin/Makefile.inc:1.1 othersrc/sbin/Makefile.inc:1.2 --- othersrc/sbin/Makefile.inc:1.1 Mon Mar 23 21:03:59 2009 +++ othersrc/sbin/Makefile.inc Tue Mar 24 15:14:24 2009 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.1 2009/03/23 21:03:59 stacktic Exp $ +# $NetBSD: Makefile.inc,v 1.2 2009/03/24 15:14:24 stacktic Exp $ WARNS?= 1 BINDIR?=/usr/local/sbin MANDIR?=/usr/local/man # Eventually, this may move to the main tree, as: #BINDIR?=/sbin -MKMAN= no Index: othersrc/sbin/fsu_mknod/Makefile diff -u othersrc/sbin/fsu_mknod/Makefile:1.1 othersrc/sbin/fsu_mknod/Makefile:1.2 --- othersrc/sbin/fsu_mknod/Makefile:1.1 Mon Mar 23 21:03:59 2009 +++ othersrc/sbin/fsu_mknod/Makefile Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:59 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= mknod.c pack_dev.c MAN= fsu_mknod.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/usr.bin/Makefile.inc diff -u othersrc/usr.bin/Makefile.inc:1.3 othersrc/usr.bin/Makefile.inc:1.4 --- othersrc/usr.bin/Makefile.inc:1.3 Mon Mar 23 21:03:59 2009 +++ othersrc/usr.bin/Makefile.inc Tue Mar 24 15:14:24 2009 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.3 2009/03/23 21:03:59 stacktic Exp $ +# $NetBSD: Makefile.inc,v 1.4 2009/03/24 15:14:24 stacktic Exp $ WARNS?= 1 BINDIR?=/usr/local/bin MANDIR?=/usr/local/man # Eventually, this may move to the main tree, as: #BINDIR?=/usr/bin -MKMAN=no Index: othersrc/usr.bin/fsu_chflags/Makefile diff -u othersrc/usr.bin/fsu_chflags/Makefile:1.1 othersrc/usr.bin/fsu_chflags/Makefile:1.2 --- othersrc/usr.bin/fsu_chflags/Makefile:1.1 Mon Mar 23 21:03:59 2009 +++ othersrc/usr.bin/fsu_chflags/Makefile Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:03:59 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,7 @@ SRCS= chflags.c MAN= fsu_chflags.1 -DPADD+= ${LIBUTIL} CFLAGS+= -Wl,--wrap=chflags,--wrap=lchflags -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/usr.bin/fsu_du/Makefile diff -u othersrc/usr.bin/fsu_du/Makefile:1.1 othersrc/usr.bin/fsu_du/Makefile:1.2 --- othersrc/usr.bin/fsu_du/Makefile:1.1 Mon Mar 23 21:04:00 2009 +++ othersrc/usr.bin/fsu_du/Makefile Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:04:00 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= du.c MAN= fsu_du.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/usr.bin/fsu_mkfifo/Makefile diff -u othersrc/usr.bin/fsu_mkfifo/Makefile:1.1 othersrc/usr.bin/fsu_mkfifo/Makefile:1.2 --- othersrc/usr.bin/fsu_mkfifo/Makefile:1.1 Mon Mar 23 21:04:00 2009 +++ othersrc/usr.bin/fsu_mkfifo/Makefile Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:04:00 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,15 +7,5 @@ SRCS= mkfifo.c MAN= fsu_mkfifo.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/usr.bin/fsu_touch/Makefile diff -u othersrc/usr.bin/fsu_touch/Makefile:1.1 othersrc/usr.bin/fsu_touch/Makefile:1.2 --- othersrc/usr.bin/fsu_touch/Makefile:1.1 Mon Mar 23 21:04:00 2009 +++ othersrc/usr.bin/fsu_touch/Makefile Tue Mar 24 15:14:24 2009 @@ -1,18 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:04:00 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # PROG= fsu_touch MAN= fsu_touch.1 -DPADD+= ${LIBUTIL} - -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Index: othersrc/usr.sbin/fsu_chown/Makefile diff -u othersrc/usr.sbin/fsu_chown/Makefile:1.1 othersrc/usr.sbin/fsu_chown/Makefile:1.2 --- othersrc/usr.sbin/fsu_chown/Makefile:1.1 Mon Mar 23 21:04:00 2009 +++ othersrc/usr.sbin/fsu_chown/Makefile Tue Mar 24 15:14:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/03/23 21:04:00 stacktic Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/24 15:14:24 stacktic Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 @@ -7,17 +7,7 @@ SRCS= chown.c MAN= fsu_chown.1 -DPADD+= ${LIBUTIL} - CFLAGS+= -Wl,--wrap=chown,--wrap=lchown -CPPFLAGS+= -DUSE_UKFS -I../../lib/libfsu_utils -I../../lib/libfsu_mount - -LDADD+= -lutil -L../../lib/libfsu_utils -L../../lib/libfsu_mount \ - -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount - -.if exists(/usr/lib/librumpvfs.so) -LDADD+= -lrumpvfs -.endif - +.include "${.CURDIR}/../../Makefile.fsu" .include <bsd.prog.mk> Added files: Index: othersrc/Makefile.fsu diff -u /dev/null othersrc/Makefile.fsu:1.1 --- /dev/null Tue Mar 24 15:14:25 2009 +++ othersrc/Makefile.fsu Tue Mar 24 15:14:22 2009 @@ -0,0 +1,13 @@ +# $NetBSD: Makefile.fsu,v 1.1 2009/03/24 15:14:22 stacktic Exp $ +# + +DPADD+= ${LIBUTIL} + +CPPFLAGS+= -DUSE_UKFS -I/usr/local/include + +LDADD+= -lutil -L/usr/local/lib \ + -lukfs -lrump -lrumpuser -lfsu_utils -lfsu_mount + +.if exists(/usr/lib/librumpvfs.so) +LDADD+= -lrumpvfs +.endif