Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2008-12-17 11:20:44 -08:00
parent d4e526c56b 3932b368f5
commit fa1224e4d3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/zfs/Makefile.in
View File

@ -60,7 +60,12 @@ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(sbin_PROGRAMS) PROGRAMS = $(sbin_PROGRAMS)
am_zfs_OBJECTS = zfs_iter.$(OBJEXT) zfs_main.$(OBJEXT) am_zfs_OBJECTS = zfs_iter.$(OBJEXT) zfs_main.$(OBJEXT)
zfs_OBJECTS = $(am_zfs_OBJECTS) zfs_OBJECTS = $(am_zfs_OBJECTS)
zfs_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la zfs_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
depcomp = $(SHELL) $(top_srcdir)/config/depcomp depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -228,7 +233,12 @@ zfs_SOURCES = \
${top_srcdir}/cmd/zfs/zfs_util.h ${top_srcdir}/cmd/zfs/zfs_util.h
zfs_LDADD = \ zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
all: all-am all: all-am

2
lib/Makefile.in
View File

@ -191,7 +191,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
SUBDIRS = libspl libavl libnvpair libuutil libzfs # libzpool SUBDIRS = libspl libavl libnvpair libuutil libzfs libzpool
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES: