aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--lib/Makefile.am38
-rw-r--r--src/Makefile.am2
-rw-r--r--src/main.c1
-rw-r--r--tests/Makefile.am4
5 files changed, 43 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 2cdee78..06fbe3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,9 @@
ABOUT-NLS
ChangeLog
INSTALL
+Make.rules
Makefile
Makefile.in
-Make.rules
aclocal.m4
autom4te.cache
build-aux
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..a05f855
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,38 @@
+# Makefile for GNU tar library. -*- Makefile -*-
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004,
+# 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+
+# This program 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 3 of the License, or
+# (at your option) any later version.
+
+# This program 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.
+
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+noinst_LIBRARIES=libpax.a
+rmt-command.h : Makefile
+ rm -f $@-t $@
+ echo "#ifndef DEFAULT_RMT_COMMAND" >> $@-t
+ echo "# define DEFAULT_RMT_COMMAND \"$(DEFAULT_RMT_DIR)/`echo rmt | sed '$(transform)'`$(EXEEXT)\"" >> $@-t
+ echo "#endif" >> $@-t
+ mv $@-t $@
+BUILT_SOURCES = rmt-command.h
+CLEANFILES = rmt-command.h rmt-command.h-t
+INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu
+
+noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h
+libpax_a_SOURCES = \
+ exit.c\
+ paxlib.h\
+ rtapelib.c\
+ system.h\
+ error.c\
+ names.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b44d39..70b2563 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA.
-INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib
+INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib
bin_PROGRAMS=cpio @CPIO_MT_PROG@
EXTRA_PROGRAMS=mt
diff --git a/src/main.c b/src/main.c
index 4f2fca3..f95a9ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,6 +41,7 @@
#include "extern.h"
#include <rmt.h>
#include <rmt-command.h>
+#include "configmake.h"
enum cpio_options {
NO_ABSOLUTE_FILENAMES_OPTION=256,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4dd011a..b4ad2ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -62,11 +62,11 @@ clean-local:
$(SHELL) $(TESTSUITE) --clean
check-local: atconfig atlocal $(TESTSUITE)
- $(SHELL) $(TESTSUITE)
+ $(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
# Run the test suite on the *installed* tree.
installcheck-local:
- $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+ $(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
## ------------ ##

Return to:

Send suggestions and report system problems to the System administrator.