diff options
| -rw-r--r-- | .cvsignore | 3 | ||||
| -rw-r--r-- | ChangeLog | 70 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | README-alpha | 61 | ||||
| -rw-r--r-- | configure.ac | 126 | ||||
| -rw-r--r-- | doc/cpio.1 | 309 | ||||
| -rw-r--r-- | po/POTFILES.in | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 51 |
9 files changed, 163 insertions, 476 deletions
@@ -13,4 +13,5 @@ config.h nonexistent ABOUT-NLS m4 -scripts
\ No newline at end of file +scripts +INSTALL
\ No newline at end of file @@ -1,3 +1,73 @@ +2004-09-06 Sergey Poznyakoff <gray@Mirddin.farlep.net> + + Started merging with tar into paxutils. Sources before + this point are tagged alpha-2_50_90. + + * bootstrap: New file + * autogen.sh: Removed + * Makefile.am: Updated + * NEWS: Updated + * README-alpha: Updated + * configure.ac: Updated + * doc/cpio.1: Updated + * po/POTFILES.in: Updated + + * src/Makefile.am: Updated + * src/error.c: Removed + * src/dirname.c: Likewise + * src/xmalloc.c: Likewise + * src/stripslash.c: Likewise + * src/xstrdup.c + * src/gettext.h: Likewise + * src/system.h: Likewise + * src/rmt.h: Likewise + * src/getopt.c: Likewise + * src/getopt1.c: Likewise + * src/bcopy.c: Likewise + * src/fnmatch.c: Likewise + * src/mkdir.c: Likewise + * src/strdup.c: Likewise + * src/argp-ba.c: Likewise + * src/argp-eexst.c: Likewise + * src/argp-fmtstream.c: Likewise + * src/argp-fs-xinl.c: Likewise + * src/argp-help.c: Likewise + * src/argp-parse.c: Likewise + * src/argp-pv.c: Likewise + * src/argp-pvh.c: Likewise + * src/argp-xinl.c: Likewise + * src/pin.c: Likewise + * src/alloca.c: Likewise + * src/argmatch.c: Likewise + * src/rmt.c: Likewise + * src/rtapelib.c: Likewise + * src/strerror.c: Likewise + + * src/copyin.c: Switched to ANSI C (sigh) + * src/copyout.c: Likewise + * src/copypass.c: Likewise + * src/defer.c: Likewise + * src/defer.h: Likewise + * src/dstring.c: Likewise + * src/dstring.h: Likewise + * src/extern.h: Likewise + * src/filemode.c: Likewise + * src/global.c: Likewise + * src/idcache.c: Likewise + * src/main.c: Likewise + * src/makepath.c: Likewise + * src/mt.c: Likewise + * src/tar.c: Likewise + * src/userspec.c: Likewise + * src/util.c: Likewise + + * lib: New directory + * lib/Makefile.tmpl: New file + * lib/bcopy.c: Moved from ../src + * lib/mkdir.c: Likewise. + * lib/strdup.c: Likewise. + * lib/strerror.c: Likewise. + 2004-08-30 Sergey Poznyakoff <gray@Mirddin.farlep.net> * Makefile.am: Added headers to SUBDIRS. diff --git a/Makefile.am b/Makefile.am index 642871c..e71bddf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2 std-options -SUBDIRS = doc headers src po +SUBDIRS = doc headers lib rmt src po @@ -8,6 +8,14 @@ Version 2.5.90 * Added NLS support +* Improved configure script + +* Improved invocation consistency checking and help output + +* Bugfixes: +** If a file grew n bytes in copy-pass mode, these n bytes got prepended +to the contents of all subsequent files. + Major changes in version 2.5: diff --git a/README-alpha b/README-alpha index 5aa5800..3647f87 100644 --- a/README-alpha +++ b/README-alpha @@ -11,23 +11,68 @@ automake 1.8 libtool 1.4.3 gettext 0.13 -To build the configuration suite, run +Before building the package, run "bootstrap". It obtains various +additional files from the CVS repository and the Translation Project +site and prepares the source directory for building. - ./autogen.sh +When run without arguments, bootstrap will try to obtain gnulib and +paxutils files from their corresponding CVS repositories on Savannah +using anonymous SSH access. Then, it will fetch the po files from tar +page at Translation Project, and, finally, it will start autoconfiguration +process. Simply running it without arguments should do in most cases. +Several options allow to control the behavior of bootstrap: + + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth dowloading + them again. + + --paxutils-srcdir=DIRNAME Specify the local directory where paxutils + sources reside. Use this if you already + have paxutils sources on your machine, and + do not want to waste your bandwidth dowloading + them again. + + --cvs-auth=METHOD Set the CVS access method used for downloading + gnulib files. METHOD is one of the keywords + accepted by cvs -d option (see info cvs + repository). + + --cvs-user=USERNAME Set the CVS username to be used when accessing + the gnulib repository. + + --no-po Do not download po files. + +Notice also that when using CVS authentication method "ext", bootstrap +will set the variable CVS_RSH to "ssh", unless it is already set to +some other value. Then, configure and build the package as usual. Report bugs to <bug-cpio@gnu.org> -To retrieve the sources from CVS issue the following command: + + +Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU cpio. + +GNU cpio is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. -CVS_RSH=ssh \ - cvs -d :ext:anoncvs@savannah.gnu.org:/cvsroot/cpio checkout cpio +GNU cpio is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Make sure SSHv2 is used. +You should have received a copy of the GNU General Public License +along with GNU cpio; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. -This will give you read-only access. If you think you need write access, -contact the maintainer. diff --git a/configure.ac b/configure.ac index 392538e..9f3c00e 100644 --- a/configure.ac +++ b/configure.ac @@ -25,14 +25,13 @@ AC_CONFIG_HEADERS([config.h]) AC_PREREQ(2.54) dnl Check for programs +gl_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_PROG_CPP AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL - -AC_AIX -AC_MINIX -AC_ISC_POSIX +AC_PROG_RANLIB +AC_C_PROTOTYPES AC_SYS_LARGEFILE @@ -44,30 +43,12 @@ AC_CHECK_TYPE(gid_t, int) AC_HEADER_STDC AC_HEADER_DIRENT -AC_SUBST(CPIO_MT_PROG) -AC_SUBST(CPIO_RMT_PROG) - -AC_CHECKING(for remote tape and socket header files) -AC_CHECK_HEADER(sys/mtio.h, -[AC_DEFINE(HAVE_SYS_MTIO_H,1,[Define if you have working sys/mtio.h]) - CPIO_MT_PROG="mt" - AC_TRY_CPP([ -#include <sgtty.h> -#include <sys/socket.h>], - CPIO_RMT_PROG="rmt")]) +cpio_GNULIB -AC_CHECKING(for remote shell) -if test -f /usr/ucb/rsh || test -f /usr/bin/remsh || test -f /usr/bin/rsh || - test -f /usr/bsd/rsh || test -f /usr/bin/nsh; then - AC_LIBOBJ(rtapelib) -else - AC_CHECK_HEADER(netdb.h, - [AC_DEFINE(HAVE_NETDB_H,1,[Define if you have netbd.h]) - AC_LIBOBJ(rtapelib)], - AC_DEFINE(NO_REMOTE,1,[Define if rmt is not needed])) -fi +AC_SUBST(CPIO_MT_PROG) +PU_RMT -AC_CHECK_HEADERS(unistd.h stdlib.h string.h fcntl.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h) +AC_CHECK_HEADERS(unistd.h stdlib.h string.h fcntl.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h) AC_REPLACE_FUNCS(bcopy mkdir strdup strerror) AC_MSG_CHECKING(for sys_errlist and sys_nerr) @@ -96,7 +77,7 @@ AC_CHECK_DECLS([errno, sys_nerr, sys_errlist, getpwnam, getgrnam, getgrgid, strd dnl Checks for fnmatch have_fnmatch=no AC_MSG_CHECKING(for working fnmatch) -dnl Some versions of Soalris have a fnmatch() function, but it doesn't work! +dnl Some versions of Solaris have a fnmatch() function, but it doesn't work! dnl So we run a test program. If we're cross-compiling, do it the old way. AC_TRY_RUN([ main() { @@ -117,102 +98,15 @@ AC_FUNC_ALLOCA AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"]) AC_CHECK_LIB(socket, setsockopt, [LIBS="$LIBS -lsocket"]) -AC_TRY_RUN([ -#include <unistd.h> -#ifdef HAVE_GETOPT_H -# include <getopt.h> -#endif - -struct option longopt[] = { - "help", no_argument, 0, 'h', - (char*)0 -}; - -main(argc, argv) -int argc; char **argv; -{ - getopt_long_only(argc, argv, "h", longopt, (int*)0); - return 0; -}], - cpio_cv_have_gnu_getopt=yes, - cpio_cv_have_gnu_getopt=no, - cpio_cv_have_gnu_getopt=no) - -if test x"$cpio_cv_have_gnu_getopt" != xyes ; then - AC_CONFIG_LINKS(src/getopt.h:headers/getopt.h) - AC_LIBOBJ(getopt) - AC_LIBOBJ(getopt1) -fi - -USE_INCLUDED_ARGP= -AC_ARG_WITH([included-argp], - AC_HELP_STRING([--with-included-argp], - [Use included argp library]), - [USE_INCLUDED_ARGP=${withval}], - [AC_CHECK_HEADER(argp.h, - [AC_CHECK_FUNCS(argp_parse, :, - [USE_INCLUDED_ARGP=yes])], - [USE_INCLUDED_ARGP=yes])]) - -if test "$USE_INCLUDED_ARGP" = yes; then - AC_LIBOBJ(argp-ba) - AC_LIBOBJ(argp-eexst) - AC_LIBOBJ(argp-fmtstream) - AC_LIBOBJ(argp-fs-xinl) - AC_LIBOBJ(argp-help) - AC_LIBOBJ(argp-parse) - AC_LIBOBJ(argp-pv) - AC_LIBOBJ(argp-pvh) - AC_LIBOBJ(argp-xinl) - AC_LIBOBJ(pin) - AC_CONFIG_LINKS(src/argp.h:headers/argp.h) -fi - -save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -Isrc" -AC_MSG_CHECKING(whether extern program_invocation_name is present) -AC_TRY_COMPILE([#include <argp.h> -#include <errno.h>], -[ program_invocation_name = "test"; ], -[AC_DEFINE(PROGRAM_INVOCATION_NAME_DECLARED,1, - [Define if program_invocation_name is declared in argp.h]) - AC_MSG_RESULT(yes)], -[AC_MSG_RESULT(no)]) - -AH_BOTTOM([ -#ifndef PROGRAM_INVOCATION_NAME_DECLARED -extern char *program_invocation_short_name; -extern char *program_invocation_name; -#endif]) - -AC_MSG_CHECKING(whether program_invocation_name is declared) -AC_TRY_COMPILE([#include <argp.h> -#include <errno.h>], -[ -#ifndef PROGRAM_INVOCATION_NAME_DECLARED - extern char *program_invocation_name; -#endif - program_invocation_name = "test"; -], -[AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,1, - [Define if the variable program_invocation_name exists]) - AC_MSG_RESULT(yes)], -[AC_MSG_RESULT(no)]) -CPPFLAGS=$save_CPPFLAGS - # Gettext. AM_GNU_GETTEXT([external], [need-ngettext]) AM_GNU_GETTEXT_VERSION(0.13) -AH_BOTTOM([ -#include "gettext.h" -#define _(s) gettext(s) -#define N_(s) gettext_noop(s) -]) - AC_CONFIG_FILES([Makefile doc/Makefile headers/Makefile + lib/Makefile + rmt/Makefile src/Makefile po/Makefile.in]) AC_OUTPUT @@ -31,310 +31,11 @@ cpio \- copy files to and from archives [\-\-dereference] [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-sparse] [\-\-help] [\-\-version] destination-directory < name-list .SH DESCRIPTION -This manual page -documents the GNU version of -.BR cpio . -.B cpio -copies files into or out of a cpio or tar archive, which is a file that -contains other files plus information about them, such as their -file name, owner, timestamps, and access permissions. The archive can -be another file on the disk, a magnetic tape, or a pipe. -.B cpio -has three operating modes. -.PP -In copy-out mode, -.B cpio -copies files into an archive. It reads a list of filenames, one per -line, on the standard input, and writes the archive onto the standard -output. A typical way to generate the list of filenames is with the -.B find -command; you should give -.B find -the \-depth option to minimize problems with permissions on -directories that are unwritable or not searchable. +GNU cpio is fully documented in the texinfo documentation. To access the +help from your command line, type .PP -In copy-in mode, -.B cpio -copies files out of an archive or lists the archive contents. It -reads the archive from the standard input. Any non-option command -line arguments are shell globbing patterns; only files in the archive -whose names match one or more of those patterns are copied from the -archive. Unlike in the shell, an initial `.' in a filename does -match a wildcard at the start of a pattern, and a `/' in a filename -can match wildcards. If no patterns are given, all files are -extracted. -.PP -In copy-pass mode, -.B cpio -copies files from one directory tree to another, combining the -copy-out and copy-in steps without actually using an archive. -It reads the list of files to copy from the standard input; the -directory into which it will copy them is given as a non-option -argument. +\fBinfo cpio .PP -.B cpio -supports the following archive formats: binary, old ASCII, new -ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. -The binary format -is obsolete because it encodes information about the files in a way -that is not portable between different machine architectures. -The old ASCII format is portable between different machine architectures, -but should not be used on file systems with more than 65536 i-nodes. -The new ASCII format is portable between different machine architectures -and can be used on any size file system, but is not supported by all -versions of -.BR cpio ; -currently, it is only supported by GNU and Unix System V R4. -The crc format is -like the new ASCII format, but also contains a checksum for each file -which -.B cpio -calculates when creating an archive -and verifies when the file is extracted from the archive. -The HPUX formats are provided for compatibility with HPUX's cpio which -stores device files differently. +The online copy of the documentation is available at the following address: .PP -The tar format is provided for compatability with -the -.B tar -program. It can not be used to archive files with names -longer than 100 characters, and can not be used to archive "special" -(block or character devices) files. -The POSIX.1 tar format can not be used to archive files with names longer -than 255 characters (less unless they have a "/" in just the right place). -.PP -By default, -.B cpio -creates binary format archives, for compatibility with -older -.B cpio -programs. -When extracting from archives, -.B cpio -automatically recognizes which kind of archive it is reading and can -read archives created on machines with a different byte-order. -.PP -Some of the options to -.B cpio -apply only to certain operating modes; see the SYNOPSIS section for a -list of which options are allowed in which modes. -.SS OPTIONS -.TP -.I "\-0, \-\-null" -In copy-out and copy-pass modes, read a list of filenames terminated -by a null character instead of a newline, so that files whose names -contain newlines can be archived. GNU -.B find -is one way to produce a list of null-terminated filenames. -.TP -.I "\-a, \-\-reset-access-time" -Reset the access times of files after reading them, so that it does -not look like they have just been read. -.TP -.I "\-A, \-\-append" -Append to an existing archive. Only works in copy-out mode. The -archive must be a disk file specified with the -.I \-O -or -.I "\-F (\-\-file)" -option. -.TP -.I "\-b, \-\-swap" -In copy-in mode, swap both halfwords of words and bytes of halfwords -in the data. Equivalent to -.IR "\-sS" . -Use this option to convert 32-bit integers between big-endian and -little-endian machines. -.TP -.I "\-B" -Set the I/O block size to 5120 bytes. Initially the block size is 512 -bytes. -.TP -.I "\-\-block-size=BLOCK-SIZE" -Set the I/O block size to BLOCK-SIZE * 512 bytes. -.TP -.I "\-c" -Use the old portable (ASCII) archive format. -.TP -.I "\-C IO-SIZE, \-\-io-size=IO-SIZE" -Set the I/O block size to IO-SIZE bytes. -.TP -.I "\-d, \-\-make-directories" -Create leading directories where needed. -.TP -.I "\-E FILE, \-\-pattern-file=FILE" -In copy-in mode, read additional patterns specifying filenames to -extract or list from FILE. The lines of FILE are treated as if they -had been non-option arguments to -.BR cpio . -.TP -.I "\-f, \-\-nonmatching" -Only copy files that do not match any of the given patterns. -.TP -.I "\-F, \-\-file=archive" -Archive filename to use instead of standard input or output. To use a -tape drive on another machine as the archive, use a filename that -starts with `HOSTNAME:'. The hostname can be preceded by a -username and an `@' to access the remote tape drive as that user, if -you have permission to do so (typically an entry in that user's -`~/.rhosts' file). -.TP -.I "\-\-force-local" -With -.IR \-F , -.IR \-I , -or -.IR \-O , -take the archive file name to be a local file even if it contains a -colon, which would ordinarily indicate a remote host name. -.TP -.I "\-H FORMAT, \-\-format=FORMAT" -Use archive format FORMAT. The valid formats are listed below; -the same names are also recognized in all-caps. The default in -copy-in mode is to automatically detect the archive format, and in -copy-out mode is "bin". -.RS -.IP bin -The obsolete binary format. -.IP odc -The old (POSIX.1) portable format. -.IP newc -The new (SVR4) portable format, which supports file systems having -more than 65536 i-nodes. -.IP crc -The new (SVR4) portable format with a checksum added. -.IP tar -The old tar format. -.IP ustar -The POSIX.1 tar format. Also recognizes GNU -.B tar -archives, which are similar but not identical. -.IP hpbin -The obsolete binary format used by HPUX's cpio (which stores device files -differently). -.IP hpodc -The portable format used by HPUX's cpio (which stores device files differently). -.RE -.TP -.I "\-i, \-\-extract" -Run in copy-in mode. -.TP -.I "\-I archive" -Archive filename to use instead of standard input. To use a -tape drive on another machine as the archive, use a filename that -starts with `HOSTNAME:'. The hostname can be preceded by a -username and an `@' to access the remote tape drive as that user, if -you have permission to do so (typically an entry in that user's -`~/.rhosts' file). -.TP -.I \-k -Ignored; for compatibility with other versions of -.BR cpio . -.TP -.I "\-l, \-\-link" -Link files instead of copying them, when possible. -.TP -.I "\-L, \-\-dereference" -Dereference symbolic links (copy the files that they point to instead -of copying the links). -.TP -.I "\-m, \-\-preserve-modification-time" -Retain previous file modification times when creating files. -.TP -.I "\-M MESSAGE, \-\-message=MESSAGE" -Print MESSAGE when the end of a volume of the backup media (such as a -tape or a floppy disk) is reached, to prompt the user to insert a new -volume. If MESSAGE contains the string "%d", it is replaced by the -current volume number (starting at 1). -.TP -.I "\-n, \-\-numeric-uid-gid" -In the verbose table of contents listing, show numeric UID and GID -instead of translating them into names. -Also extracts tar archives using the numeric UID and GID instead of the -user/group names. -.RB ( cpio -archives are always extracted using the numeric UID and GID.) -.TP -.I " \-\-no-absolute-filenames" -In copy-in mode, create all files relative to the current directory, -even if they have an absolute file name in the archive. -.TP -.I " \-\-no-preserve-owner" -In copy-in mode and copy-pass mode, do not change the ownership of the -files; leave them owned by the user extracting them. This is the -default for non-root users, so that users on System V don't -inadvertantly give away files. -.TP -.I "\-o, \-\-create" -Run in copy-out mode. -.TP -.I "\-O archive" -Archive filename to use instead of standard output. To use a tape -drive on another machine as the archive, use a filename that starts -with `HOSTNAME:'. The hostname can be preceded by a username and an -`@' to access the remote tape drive as that user, if you have -permission to do so (typically an entry in that user's `~/.rhosts' -file). -.TP -.I " \-\-only-verify-crc" -When reading a CRC format archive in copy-in mode, only verify the -CRC's of each file in the archive, don't actually extract the files. -.TP -.I "\-p, \-\-pass-through" -Run in copy-pass mode. -.TP -.I "\-\-quiet" -Do not print the number of blocks copied. -.TP -.I "\-r, \-\-rename" -Interactively rename files. -.TP -.I "\-R [user][:.][group], \-\-owner [user][:.][group]" -In copy-out and copy-pass modes, set the ownership of all files created -to the specified user and/or group. Either the user or the group, or -both, must be present. If the group is omitted but the ":" or "." -separator is given, use the given user's login group. Only the -super-user can change files' ownership. -.TP -.I "\-\-rsh-command=COMMAND" -Notifies -.B mt -that it should use COMMAND to communicate with remote devices instead of -.I /usr/bin/ssh -or -.IR /usr/bin/rsh . -.TP -.I "\-\-sparse" -In copy-in and copy-pass modes, write files with large blocks of zeros -as sparse files. -.TP -.I "\-s, \-\-swap-bytes" -In copy-in mode, swap the bytes of each halfword (pair of bytes) in the -files. -.TP -.I "\-S, \-\-swap-halfwords" -In copy-in mode, swap the halfwords of each word (4 bytes) in the -files. -.TP -.I "\-t, \-\-list" -Print a table of contents of the input. -.TP -.I "\-u, \-\-unconditional" -Replace all files, without asking whether to replace existing newer -files with older files. -.TP -.I "\-v, \-\-verbose" -List the files processed, or with -.IR \-t , -give an `ls \-l' style table of contents listing. In a verbose table -of contents of a ustar archive, user and group names in the archive -that do not exist on the local system are replaced by the names that -correspond locally to the numeric UID and GID stored in the archive. -.TP -.I "\-V \-\-dot" -Print a "." for each file processed. -.TP -.I "\-\-version" -Print the -.B cpio -program version number and exit. +http://www.gnu.org/software/cpio/manual diff --git a/po/POTFILES.in b/po/POTFILES.in index c71a627..d939dc3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,12 +2,13 @@ src/copyin.c src/copyout.c src/copypass.c src/dstring.c -src/getopt.c src/main.c src/makepath.c src/mt.c -src/rtapelib.c -src/strerror.c src/tar.c src/userspec.c src/util.c + +lib/getopt.c +lib/rtapelib.c +lib/strerror.c diff --git a/src/Makefile.am b/src/Makefile.am index 305075c..692e463 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,9 +15,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +INCLUDES=-I. -I.. -I$(top_srcdir)/lib + bin_PROGRAMS=cpio @CPIO_MT_PROG@ -libexec_PROGRAMS=@CPIO_RMT_PROG@ -EXTRA_PROGRAMS=mt rmt +EXTRA_PROGRAMS=mt cpio_SOURCES = \ copyin.c\ @@ -29,15 +30,10 @@ cpio_SOURCES = \ main.c\ tar.c\ util.c\ - error.c\ filemode.c\ - dirname.c\ idcache.c\ makepath.c\ - xmalloc.c\ - stripslash.c\ - userspec.c\ - xstrdup.c + userspec.c noinst_HEADERS =\ cpio.h\ @@ -48,42 +44,11 @@ noinst_HEADERS =\ dstring.h\ extern.h\ filetypes.h\ - gettext.h\ - system.h\ - rmt.h\ safe-stat.h -cpio_LDADD = @LIBOBJS@ $(INTLLIBS) - -mt_SOURCES = \ - mt.c argmatch.c -mt_LDADD = @LIBOBJS@ $(INTLLIBS) - -rmt_SOURCES = rmt.c -rmt_LDADD = @LIBOBJS@ $(INTLLIBS) - -EXTRA_DIST=\ - getopt.c\ - getopt1.c\ - bcopy.c\ - fnmatch.c\ - mkdir.c\ - strdup.c\ - argp-ba.c\ - argp-eexst.c\ - argp-fmtstream.c\ - argp-fs-xinl.c\ - argp-help.c\ - argp-parse.c\ - argp-pv.c\ - argp-pvh.c\ - argp-xinl.c\ - pin.c - -localedir = $(datadir)/locale +cpio_LDADD = ../lib/libcpio.a $(INTLLIBS) -DISTCLEANFILES = localedir.h -localedir.h : Makefile - echo '#define LOCALEDIR "$(localedir)"' >$@ +mt_SOURCES = mt.c +mt_LDADD = ../lib/lib$(PACKAGE).a $(INTLLIBS) -mt.o main.o: localedir.h +mt.o main.o: ../lib/localedir.h |