Date: Tue, 4 Jun 2002 11:57:18 -0700 From: "David O'Brien" <obrien@FreeBSD.org> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/gnu/usr.bin/tar Makefile Makefile.inc config.h localedir.h src/gnu/usr.bin/tar/doc Makefile src/gnu/usr.bin/tar/lib Makefile src/gnu/usr.bin/tar/tar Makefile buffer.c.diff common.h.diff compare.c.diff create.c.diff ... Message-ID: <20020604115718.C93786@dragon.nuxi.com> In-Reply-To: <200206041114.g54BEnI90285@freefall.freebsd.org>; from sobomax@FreeBSD.org on Tue, Jun 04, 2002 at 04:14:49AM -0700 References: <200206041114.g54BEnI90285@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 04, 2002 at 04:14:49AM -0700, Maxim Sobolev wrote:
> sobomax 2002/06/04 04:14:49 PDT
>
> Modified files:
> gnu/usr.bin/tar Makefile
> Added files:
> gnu/usr.bin/tar Makefile.inc config.h localedir.h
> gnu/usr.bin/tar/doc Makefile
> gnu/usr.bin/tar/lib Makefile
> gnu/usr.bin/tar/tar Makefile buffer.c.diff common.h.diff
> compare.c.diff create.c.diff list.c.diff
> misc.c.diff names.c.diff rtapelib.c.diff
> tar.c.diff
> Log:
> Add bmake bits for building GNU tar from src/contrib/tar.
I don't know why you made this so complicated.
I want to commit this patch. It also gives higher -j potential.
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/tar/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 4 Jun 2002 11:14:48 -0000 1.15
+++ Makefile 4 Jun 2002 18:55:30 -0000
@@ -1,5 +1,24 @@
# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.15 2002/06/04 11:14:48 sobomax Exp $
-SUBDIR= lib tar doc
+TARDIR= ${.CURDIR}/../../../contrib/tar
+.PATH: ${TARDIR}/src ${TARDIR}/lib
-.include <bsd.subdir.mk>
+SUBDIR= doc
+
+PROG= tar
+NOSHARED?= YES
+
+# lib functions
+SRCS= addext.c argmatch.c backupfile.c basename.c dirname.c error.c \
+ exclude.c full-write.c getdate.c getopt.c getopt1.c getstr.c \
+ getline.c hash.c human.c mktime.c modechange.c msleep.c prepargs.c \
+ print-copyr.c quotearg.c safe-read.c save-cwd.c savedir.c \
+ unicodeio.c xgetcwd.c xmalloc.c xstrdup.c \
+ xstrtoimax.c xstrtoul.c xstrtoumax.c
+# 'program' files
+SRCS+= buffer.c compare.c create.c delete.c extract.c incremen.c list.c \
+ mangle.c misc.c names.c rtapelib.c tar.c update.c
+
+CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${TARDIR}/lib -I${TARDIR}/src
+
+.include <bsd.prog.mk>
Index: Makefile.inc
===================================================================
RCS file: Makefile.inc
diff -N Makefile.inc
--- Makefile.inc 4 Jun 2002 11:28:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-# $FreeBSD: src/gnu/usr.bin/tar/Makefile.inc,v 1.2 2002/06/04 11:28:09 sobomax Exp $
-
-TARDIR= ${.CURDIR}/../../../../contrib/tar
-TARCFLAGS= -DHAVE_CONFIG_H -I${.CURDIR}/.. -I${TARDIR}/lib
-
-# Inherit BINDIR from one level up.
-.if !target(__foobar__)
-__foobar__:
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-.endif
Index: lib/Makefile
===================================================================
RCS file: lib/Makefile
diff -N lib/Makefile
--- lib/Makefile 4 Jun 2002 11:14:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-# $FreeBSD: src/gnu/usr.bin/tar/lib/Makefile,v 1.1 2002/06/04 11:14:49 sobomax Exp $
-
-LIB= tar
-INTERNALLIB= YES
-
-SRCS= addext.c argmatch.c backupfile.c basename.c dirname.c error.c \
- exclude.c full-write.c getdate.c getopt.c getopt1.c getstr.c \
- getline.c hash.c human.c mktime.c modechange.c msleep.c prepargs.c \
- print-copyr.c quote.c quotearg.c safe-read.c save-cwd.c savedir.c \
- unicodeio.c xgetcwd.c xmalloc.c xstrdup.c \
- xstrtoimax.c xstrtoul.c xstrtoumax.c
-
-CFLAGS+= ${TARCFLAGS}
-
-.include <bsd.lib.mk>
-
-.PATH: ${TARDIR}/lib
Index: tar/Makefile
===================================================================
RCS file: tar/Makefile
diff -N tar/Makefile
--- tar/Makefile 4 Jun 2002 17:31:16 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-# $FreeBSD: src/gnu/usr.bin/tar/tar/Makefile,v 1.2 2002/06/04 17:31:16 sobomax Exp $
-
-PROG= tar
-
-SRCS= buffer.c compare.c create.c delete.c extract.c incremen.c list.c \
- mangle.c misc.c names.c rtapelib.c tar.c update.c
-
-CFLAGS+= ${TARCFLAGS} -I${TARDIR}/src
-
-.if exists(${.OBJDIR}/../lib)
-LIBTAR= ${.OBJDIR}/../lib/libtar.a
-.else
-LIBTAR= ${.CURDIR}/../lib/libtar.a
-.endif
-
-NOSHARED?= YES
-
-DPADD= ${LIBTAR}
-LDADD= ${LIBTAR}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TARDIR}/src
-.PATH: ${.CURDIR}/..
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020604115718.C93786>